summaryrefslogtreecommitdiff
path: root/src/Propellor/PrivData
diff options
context:
space:
mode:
authorJoey Hess2014-11-15 13:46:53 -0400
committerJoey Hess2014-11-15 13:46:53 -0400
commitbeb905be9231a903afd2e2228e89e7e047384ea7 (patch)
tree543373fadb06aba5211f678695f8ab2b743f4c60 /src/Propellor/PrivData
parent90a982fcb35e35fa2344003202b40192dc13fab4 (diff)
parent269996e25d8f5481024f472a57debfd51dfcc703 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/keyring.gpg privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/PrivData')
-rw-r--r--src/Propellor/PrivData/Paths.hs2
1 files changed, 1 insertions, 1 deletions
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"