Merge branch 'master' into thunderbird2

apparmor.d/groups/apps/android-studio

@@ -6,8 +6,8 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{AS_LIBDIR}     = @{MOUNTS}/*/android-studio
-@{AS_SDKDIR}     = @{MOUNTS}/*/SDK
+@{AS_LIBDIR}     = @{MOUNTS}/android-studio
+@{AS_SDKDIR}     = @{MOUNTS}/SDK
 @{AS_HOMEDIR}    = @{HOME}/.AndroidStudio*
 @{AS_PROJECTDIR} = @{HOME}/AndroidStudioProjects
 

apparmor.d/groups/apps/atom

@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = /usr/share/atom{,-beta,-nightly,-dev}/atom /{usr/,}bin/atom
 profile atom @{exec_path} {
   include <abstractions/base>
+  include <abstractions/dconf-write>
   include <abstractions/opencl-intel>
   include <abstractions/gtk>
   include <abstractions/freedesktop.org>
@@ -86,18 +87,14 @@ profile atom @{exec_path} {
   # Git dirs
         / r,
         @{MOUNTS}/ r,
-  owner @{MOUNTS}/*/ r,
-  owner @{MOUNTS}/*/atom/ r,
-  owner @{MOUNTS}/*/atom/** rwkl -> @{MOUNTS}/*/atom/**,
+  owner @{MOUNTS}/ r,
+  owner @{user_projects_dirs}/ r,
+  owner @{user_projects_dirs}/** rwkl -> @{user_projects_dirs}/**,
 
   owner @{user_config_dirs}/git/config r,
 
   /etc/fstab r,
 
-  include <abstractions/dconf>
-  owner @{run}/user/@{uid}/dconf/ rw,
-  owner @{run}/user/@{uid}/dconf/user rw,
-
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
 
   # Needed or atom gets crash with the following error:

apparmor.d/groups/apps/calibre

@@ -75,12 +75,8 @@ profile calibre @{exec_path} {
 
   /usr/share/calibre/{,**} r,
 
-  owner @{HOME}/@{XDG_BOOKS_DIR} rw,
-  owner @{HOME}/@{XDG_BOOKS_DIR}/** rwkl,
-
-  owner @{MOUNTS}/*/@{XDG_BOOKS_DIR}/ r,
-  owner @{MOUNTS}/*/@{XDG_BOOKS_DIR}*/ rw,
-  owner @{MOUNTS}/*/@{XDG_BOOKS_DIR}*/** rwkl -> @{MOUNTS}/*/@{XDG_BOOKS_DIR}*/**,
+  owner @{user_books_dirs} rw,
+  owner @{user_books_dirs}/** rwkl -> @{user_books_dirs}/**,
 
   owner @{user_config_dirs}/calibre/ rw,
   owner @{user_config_dirs}/calibre/** rwk,

apparmor.d/groups/apps/code

@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = /usr/share/code/{bin/,}code /{usr/,}bin/code
 profile code @{exec_path} {
   include <abstractions/base>
+  include <abstractions/dconf-write>
   include <abstractions/opencl-intel>
   include <abstractions/gtk>
   include <abstractions/freedesktop.org>
@@ -63,18 +64,11 @@ profile code @{exec_path} {
   owner @{HOME}/.vscode/** rwlk -> @{HOME}/.vscode/**,
 
   # Git dirs
-        / r,
-        @{MOUNTS}/ r,
-  owner @{MOUNTS}/*/ r,
-  owner @{MOUNTS}/*/code/ r,
-  owner @{MOUNTS}/*/code/** rwkl -> @{MOUNTS}/*/code/**,
+  owner @{user_projects_dirs}/ r,
+  owner @{user_projects_dirs}/** rwkl -> @{user_projects_dirs}/**,
 
   /etc/fstab r,
 
-  include <abstractions/dconf>
-  owner @{run}/user/@{uid}/dconf/ rw,
-  owner @{run}/user/@{uid}/dconf/user rw,
-
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
 
   # Needed or code gets crash with the following error:

apparmor.d/groups/apps/filezilla

@@ -56,8 +56,8 @@ profile filezilla @{exec_path} {
   /{usr/,}lib/firefox/firefox rPUx,
 
   # FTP share folder
-  owner @{MOUNTS}/*/ftp/ r,
-  owner @{MOUNTS}/*/ftp/** rw,
+  owner @{MOUNTS}/ftp/ r,
+  owner @{MOUNTS}/ftp/** rw,
 
   # Silencer
   / r,

apparmor.d/groups/apps/freetube

@@ -15,6 +15,7 @@ include <tunables/global>
 profile freetube @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
+  include <abstractions/dconf-write>
   include <abstractions/opencl-intel>
   include <abstractions/freedesktop.org>
   include <abstractions/fonts>
@@ -67,10 +68,6 @@ profile freetube @{exec_path} {
 
   /etc/fstab r,
 
-  include <abstractions/dconf>
-  owner @{run}/user/@{uid}/dconf/ rw,
-  owner @{run}/user/@{uid}/dconf/user rw,
-
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
 
   owner @{user_share_dirs} r,

apparmor.d/groups/apps/telegram-desktop

@@ -12,6 +12,7 @@ include <tunables/global>
 profile telegram-desktop @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
+  include <abstractions/dconf-write>
   include <abstractions/opencl-intel>
   include <abstractions/gtk>
   include <abstractions/fonts>
@@ -74,10 +75,6 @@ profile telegram-desktop @{exec_path} {
   /var/lib/dbus/machine-id r,
   /etc/machine-id r,
 
-  include <abstractions/dconf>
-  owner @{run}/user/@{uid}/dconf/ rw,
-  owner @{run}/user/@{uid}/dconf/user rw,
-
   # Needed when saving files as, or otherwise the app crashes
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
 

apparmor.d/groups/apps/thunderbird

@@ -17,6 +17,7 @@ include <tunables/global>
 profile thunderbird @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
+  include <abstractions/dconf-write>
   include <abstractions/opencl-intel>
   include <abstractions/wayland>
   include <abstractions/nvidia>