summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-11-25 14:11:31 -0400
committerJoey Hess2015-11-25 14:11:31 -0400
commit7541782073732f63532951df48542ff5de4b33d2 (patch)
tree263b4a67e970c80b910535a15707824121574060
parent85c6ad020886bf52ca69c5b1d5d1998838c25ba4 (diff)
parent2a73a185881123fb26e1800a756fe897609a05ee (diff)
Merge branch 'joeyconfig'
-rw-r--r--privdata/privdata.gpg19
-rw-r--r--src/Propellor/PrivData/Paths.hs2
2 files changed, 20 insertions, 1 deletions
diff --git a/privdata/privdata.gpg b/privdata/privdata.gpg
new file mode 100644
index 00000000..5dc24245
--- /dev/null
+++ b/privdata/privdata.gpg
@@ -0,0 +1,19 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hQIMA7ODiaEXBlRZAQ//cIJvxFeOit/03TVmc4KUT0wCJYAmPBAxK4xTSajngrbA
+6atpdRv+c5LjBbBBB7dpTK+IbnOMbiqv56AvZrm5AE+94tbaN1bMrQO73Q+V7/zz
+841sbpc82IvUT7qcLuOPQux16uY2U6NTmMxcfZhN2gtSJhXNHJh3PE4FCt0PtYtS
+DCSuUpjltyrwJpI80ZZ74xNS5F0gDcEjveQXhOmD8/yguf9FbjjQCJfgTx8QbssA
+FtYbFsYva8VOO1qjDtN4nKiZELtdc1Be8h7noUz+vtovIIIp+ZnvZA8ucv3oAtFD
+bQVM1CTSgN2ltANBd2+U8/gfjSQf13648vUvi6JipaV8d3w31a1sUmhFwpRugWrd
+h2j2Hp7rzr1juyUi0JeRMe9re+llA8kRip1uyMEc4IIE+fWKaTdcqn170C/yIsYl
+w18KjLxd5eV2vNsDB7Fq/bF+DlOrjk1WT41STofUS3tmmmXg9TZux/HjV6N7gC/j
+WgYuqEG3ZI3VYCPovwm8kZOSkNuCJr6phpI785vzn0ALEPmwAC7cL4mczc2iWvJw
+bIEn2ktvuM+/p9Q0lWn0jzTQ3315KGPpyNoEAh9NFjR2YOVNTWjNAysBDoHCjgnQ
+tKULyWFIt0+CfdKwMP6SVNZ3a37paztOMr4xn3Kb7nMJJQqqf3pmeNPlZWLDo8vS
+gQHCmSpuOHbZeC5iMeFsCgz0LbyutMuPpBbkniZ+AlJCakmHUYKEDA6FLdgGrbMs
+m5XmVu1+1pi5rWAuwGM2UikChufzj/o4oPYa6TeEuPuSkK6zaWocw1MheQ8nEndT
+tC2bTog/sZVxEOVS6crK96opui/7drh7tsR1+slauN2Zaw==
+=FstW
+-----END PGP MESSAGE-----
diff --git a/src/Propellor/PrivData/Paths.hs b/src/Propellor/PrivData/Paths.hs
index 3d0d8a58..9f791b76 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"