diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2018-07-05 21:11:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 21:11:47 -0700 |
| commit | 910c4c6aabe9783f3b611c3cdc18081a4b55fe71 (patch) | |
| tree | ce4e6be351bc0d18c4aa3eacbcb71c803ec3a155 | |
| parent | Merge branch 'release-1.12' (diff) | |
| parent | README, man, apparmor: Update configuration file path (diff) | |
| download | redshift-ng-910c4c6aabe9783f3b611c3cdc18081a4b55fe71.tar.gz redshift-ng-910c4c6aabe9783f3b611c3cdc18081a4b55fe71.tar.bz2 redshift-ng-910c4c6aabe9783f3b611c3cdc18081a4b55fe71.tar.xz | |
Merge pull request #610 from kakurasan/xdg-spec-data
README, man, apparmor: Update configuration file path
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | data/apparmor/usr.bin.redshift.in | 2 | ||||
| -rw-r--r-- | redshift.1 | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -39,7 +39,7 @@ automatic location provider. An example configuration can be found in The configuration file should be saved in the following location depending on the platform: -- Linux/macOS: `~/.config/redshift.conf`. +- Linux/macOS: `~/.config/redshift/redshift.conf` (if the environment variable `XDG_CONFIG_HOME` is undefined) or `${XDG_CONFIG_HOME}/redshift/redshift.conf` (if `XDG_CONFIG_HOME` is defined). - Windows: Put `redshift.conf` in `%USERPROFILE%\AppData\Local\` (aka `%localappdata%`). diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in index d6696db..dd9d9ae 100644 --- a/data/apparmor/usr.bin.redshift.in +++ b/data/apparmor/usr.bin.redshift.in @@ -35,7 +35,7 @@ # Allow but log any other dbus activity audit dbus bus=system, - owner @{HOME}/.config/redshift.conf r, + owner @{HOME}/.config/redshift/redshift.conf r, # Site-specific additions and overrides. See local/README for details. #include <local/usr.bin.redshift> @@ -93,7 +93,9 @@ Default temperature values: Daytime: 6500K, night: 4500K .SH CONFIGURATION FILE A configuration file with the name \fIredshift.conf\fR can optionally be -placed in \fI~/.config/\fR. The file has standard INI format. General +placed in \fI~/.config/redshift/\fR (if the environment variable +XDG_CONFIG_HOME is undefined) or \fI${XDG_CONFIG_HOME}/redshift/\fR +(if XDG_CONFIG_HOME is defined). The file has standard INI format. General program options are placed under the \fBredshift\fR header, while options for location providers and adjustment methods are placed under a header with the name of that provider or method. General options are: |