diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-15 13:44:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-15 13:45:23 -0400 |
| commit | 269996e25d8f5481024f472a57debfd51dfcc703 (patch) | |
| tree | c6d24470434b24d167e0b2dff1fa53700492e318 | |
| parent | d65337d3e722582874d8ced4e3be5fc3d2778e70 (diff) | |
moving privdata to privdata.joey (for joeyconfig branch only)
This will be reverted on master. This way, my ongoing development on my
joeyconfig branch, including privdata changes, won't result in changes
being merged into the privdata/ dir on master. Such changes can cause
problems for other propellor users, who can get conflicts in their own
privdata when merging from master.
| -rw-r--r-- | privdata.joey/keyring.gpg (renamed from privdata/keyring.gpg) | bin | 113014 -> 113014 bytes | |||
| -rw-r--r-- | privdata.joey/privdata.gpg (renamed from privdata/privdata.gpg) | 0 | ||||
| -rw-r--r-- | src/Propellor/PrivData/Paths.hs | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/privdata/keyring.gpg b/privdata.joey/keyring.gpg Binary files differindex 01dd24e7..01dd24e7 100644 --- a/privdata/keyring.gpg +++ b/privdata.joey/keyring.gpg diff --git a/privdata/privdata.gpg b/privdata.joey/privdata.gpg index 5872c5c4..5872c5c4 100644 --- a/privdata/privdata.gpg +++ b/privdata.joey/privdata.gpg diff --git a/src/Propellor/PrivData/Paths.hs b/src/Propellor/PrivData/Paths.hs index 7c29f1bf..1922a31e 100644 --- a/src/Propellor/PrivData/Paths.hs +++ b/src/Propellor/PrivData/Paths.hs @@ -3,7 +3,7 @@ module Propellor.PrivData.Paths where import System.FilePath privDataDir :: FilePath -privDataDir = "privdata" +privDataDir = "privdata.joey" privDataFile :: FilePath privDataFile = privDataDir </> "privdata.gpg" |