summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--debian/changelog5
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/Tor.hs1
4 files changed, 5 insertions, 4 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index a00e5a17..0a2b0e99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-propellor (4.0.1) UNRELEASED; urgency=medium
+propellor (4.0.1) unstable; urgency=medium
* Fix build with pre-AMP ghc.
+ * Tor: Restart daemon after installing private key.
* Tor.named, Tor.torPrivKey: Include the new ed25519 public/private key
pair in addition to the old secret_id_key.
- -- Joey Hess <id@joeyh.name> Sat, 18 Mar 2017 19:40:35 -0400
+ -- Joey Hess <id@joeyh.name> Sat, 18 Mar 2017 20:19:41 -0400
propellor (4.0.0) unstable; urgency=medium
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index 710007cb..8794bc7f 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -57,6 +57,7 @@ named n = configured [("Nickname", n')]
-- and ed25519_master_id_secret_key from privdata.
torPrivKey :: Context -> Property (HasInfo + DebianLike)
torPrivKey context = mconcat (map go keyfiles)
+ `onChange` restarted
`requires` torPrivKeyDirExists
where
keyfiles = map (torPrivKeyDir </>)