3 files changed, 46 insertions, 4 deletions
diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in
new file mode 100644
index 0000000..dd9d9ae
--- /dev/null
+++ b/data/apparmor/usr.bin.redshift.in
@@ -0,0 +1,42 @@
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2015 Cameron Norman <camerontnorman@gmail.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ------------------------------------------------------------------
+
+#include <tunables/global>
+@bindir@/redshift {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/dbus-strict>
+  #include <abstractions/X>
+
+  dbus send
+       bus=system
+       path=/org/freedesktop/GeoClue2/Client/[0-9]*,
+
+  dbus receive
+       bus=system
+       path=/org/freedesktop/GeoClue2/Manager,
+
+  # Allow but log any other dbus activity
+  audit dbus bus=system,
+
+  owner @{HOME}/.config/redshift/redshift.conf r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.redshift>
+}
diff --git a/data/systemd/redshift-gtk.service.in b/data/systemd/redshift-gtk.service.in
index 4675ccf..79e6165 100644
--- a/data/systemd/redshift-gtk.service.in
+++ b/data/systemd/redshift-gtk.service.in
@@ -1,11 +1,11 @@
 [Unit]
 Description=Redshift display colour temperature adjustment (GUI)
 Documentation=http://jonls.dk/redshift/
-After=display-manager.service
+After=graphical-session.target
 
 [Service]
 ExecStart=@bindir@/redshift-gtk
 Restart=always
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target
diff --git a/data/systemd/redshift.service.in b/data/systemd/redshift.service.in
index bc51514..aad31ca 100644
--- a/data/systemd/redshift.service.in
+++ b/data/systemd/redshift.service.in
@@ -1,11 +1,11 @@
 [Unit]
 Description=Redshift display colour temperature adjustment
 Documentation=http://jonls.dk/redshift/
-After=display-manager.service
+After=graphical-session.target
 
 [Service]
 ExecStart=@bindir@/redshift
 Restart=always
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target