diff --git a/apparmor.d/tunables/multiarch.d/paths b/apparmor.d/tunables/multiarch.d/paths index 605dede9..3fb6ce44 100644 --- a/apparmor.d/tunables/multiarch.d/paths +++ b/apparmor.d/tunables/multiarch.d/paths @@ -28,7 +28,7 @@ # Emails @{thunderbird_path} = @{bin}/@{thunderbird_name} @{thunderbird_lib_dirs}/@{thunderbird_name} -@{emails_path} = @{thunderbird_path} @{bin}/@{emails} +@{emails_path} = @{thunderbird_path} @{bin}/@{emails_names} # Open @{open_path} = @{bin}/exo-open @{bin}/xdg-open @{bin}/gio @@ -36,24 +36,24 @@ @{open_path} += @{lib}/@{multiarch}/glib-[0-9]*/gio-launch-desktop # File explorers -@{file_explorers_path} = @{bin}/@{file_explorers} +@{file_explorers_path} = @{bin}/@{file_explorers_names} # Text editors -@{text_editors_path} = @{bin}/@{text_editors} /usr/share/code/{bin/,}code +@{text_editors_path} = @{bin}/@{text_editors_names} /usr/share/code/{bin/,}code # Document viewers -@{document_viewers_path} = @{bin}/@{document_viewers} +@{document_viewers_path} = @{bin}/@{document_viewers_names} # Image viewers -@{image_viewers_path} = @{bin}/@{image_viewers} +@{image_viewers_path} = @{bin}/@{image_viewers_names} # Archive viewers -@{archive_viewers_path} = @{bin}/@{archive_viewers} +@{archive_viewers_path} = @{bin}/@{archive_viewers_names} # Office suites -@{offices_path} = @{bin}/@{offices} @{lib}/libreoffice/program/soffice +@{offices_path} = @{bin}/@{offices_names} @{lib}/libreoffice/program/soffice # Help -@{help_path} = @{bin}/@{help} +@{help_path} = @{bin}/@{help_names} # vim:syntax=apparmor diff --git a/apparmor.d/tunables/multiarch.d/programs b/apparmor.d/tunables/multiarch.d/programs index 786101ff..f72e5692 100644 --- a/apparmor.d/tunables/multiarch.d/programs +++ b/apparmor.d/tunables/multiarch.d/programs @@ -5,6 +5,10 @@ # Define some some commonly used programs. This is not an exhaustive list. # It is meant to label programs to easily provide access in profiles. +# All variables that refer to a program name should have the `_name` suffix. +# variables that refer to a list of progran should have the `_names` suffix. +# @{sh}, @{shells}, and @{coreutils} are the only exceptions. + # Default distribution shells @{sh} = sh bash dash @@ -49,27 +53,27 @@ @{thunderbird_name} = thunderbird{,.sh,-bin} @{thunderbird_lib_dirs} = @{lib}/@{thunderbird_name} -@{emails} = evolution geary +@{emails_names} = evolution geary # File explorers -@{file_explorers} = dolphin nautilus thunar +@{file_explorers_names} = dolphin nautilus thunar # Text editors -@{text_editors} = code gedit mousepad gnome-text-editor +@{text_editors_names} = code gedit mousepad gnome-text-editor # Document viewers -@{document_viewers} = evince okular *{F,f}oliate YACReader +@{document_viewers_names} = evince okular *{F,f}oliate YACReader # Image viewers -@{image_viewers} = eog loupe ristretto +@{image_viewers_names} = eog loupe ristretto # Archive viewers -@{archive_viewers} = engrampa file-roller xarchiver +@{archive_viewers_names} = engrampa file-roller xarchiver # Office suites -@{offices} = libreoffice soffice +@{offices_names} = libreoffice soffice # Help -@{help} = yelp +@{help_names} = yelp # vim:syntax=apparmor