From 3350d482feab39c492fe195201dd8d0d85e31a70 Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Thu, 13 Sep 2018 16:45:39 +0000 Subject: [PATCH] utils: Point to the correct Profiles wiki page The URL redirect ends up at a page in the new wiki that doesn't exist. We have to link directly to the gitlab URL here since the current URL redirect doesn't let us use a wiki.apparmor.net URL and still reach the expected Profiles page. Signed-off-by: Tyler Hicks --- deprecated/utils/aa-genprof | 4 ++-- utils/aa-genprof | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deprecated/utils/aa-genprof b/deprecated/utils/aa-genprof index 33046042b..a2225a7f7 100755 --- a/deprecated/utils/aa-genprof +++ b/deprecated/utils/aa-genprof @@ -138,7 +138,7 @@ my $ratelimit_saved = sysctl_read($ratelimit_sysctl); END { sysctl_write($ratelimit_sysctl, $ratelimit_saved); } sysctl_write($ratelimit_sysctl, 0); -UI_Info(gettext("\nBefore you begin, you may wish to check if a\nprofile already exists for the application you\nwish to confine. See the following wiki page for\nmore information:\nhttp://wiki.apparmor.net/index.php/Profiles")); +UI_Info(gettext("\nBefore you begin, you may wish to check if a\nprofile already exists for the application you\nwish to confine. See the following wiki page for\nmore information:\nhttps://gitlab.com/apparmor/apparmor/wikis/Profiles")); UI_Important(gettext("Please start the application to be profiled in \nanother window and exercise its functionality now.\n\nOnce completed, select the \"Scan\" button below in \norder to scan the system logs for AppArmor events. \n\nFor each AppArmor event, you will be given the \nopportunity to choose whether the access should be \nallowed or denied.")); @@ -195,7 +195,7 @@ for my $p (sort keys %helpers) { } UI_Info(gettext("Reloaded AppArmor profiles in enforce mode.")); -UI_Info(gettext("\nPlease consider contributing your new profile! See\nthe following wiki page for more information:\nhttp://wiki.apparmor.net/index.php/Profiles\n")); +UI_Info(gettext("\nPlease consider contributing your new profile! See\nthe following wiki page for more information:\nhttps://gitlab.com/apparmor/apparmor/wikis/Profiles\n")); UI_Info(sprintf(gettext('Finished generating profile for %s.'), $fqdbin)); exit 0; diff --git a/utils/aa-genprof b/utils/aa-genprof index 9614803b7..58a781fbe 100755 --- a/utils/aa-genprof +++ b/utils/aa-genprof @@ -128,7 +128,7 @@ except PermissionError: # will fail in lxd atexit.register(restore_ratelimit) -aaui.UI_Info(_('\nBefore you begin, you may wish to check if a\nprofile already exists for the application you\nwish to confine. See the following wiki page for\nmore information:')+'\nhttp://wiki.apparmor.net/index.php/Profiles') +aaui.UI_Info(_('\nBefore you begin, you may wish to check if a\nprofile already exists for the application you\nwish to confine. See the following wiki page for\nmore information:')+'\nhttps://gitlab.com/apparmor/apparmor/wikis/Profiles') aaui.UI_Important(_('Please start the application to be profiled in\nanother window and exercise its functionality now.\n\nOnce completed, select the "Scan" option below in \norder to scan the system logs for AppArmor events. \n\nFor each AppArmor event, you will be given the \nopportunity to choose whether the access should be \nallowed or denied.')) @@ -170,6 +170,6 @@ for p in sorted(apparmor.helpers.keys()): apparmor.reload(p) aaui.UI_Info(_('\nReloaded AppArmor profiles in enforce mode.')) -aaui.UI_Info(_('\nPlease consider contributing your new profile!\nSee the following wiki page for more information:')+'\nhttp://wiki.apparmor.net/index.php/Profiles\n') +aaui.UI_Info(_('\nPlease consider contributing your new profile!\nSee the following wiki page for more information:')+'\nhttps://gitlab.com/apparmor/apparmor/wikis/Profiles\n') aaui.UI_Info(_('Finished generating profile for %s.')%program) sys.exit(0)