summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs12
-rw-r--r--config-joey.hs3
2 files changed, 13 insertions, 2 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index 1d555537..28b3dffd 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -300,3 +300,15 @@ twitRss = combineProperties "twitter rss"
crontime = "15 * * * *"
feed url desc = Cron.job desc crontime "joey" dir $
"./twitRss " ++ shellEscape url ++ " > " ++ shellEscape ("../" ++ desc ++ ".rss")
+
+ircBouncer :: Property
+ircBouncer = propertyList "IRC bouncer"
+ [ Apt.installed ["znc"]
+ , User.accountFor "znc"
+ , File.hasPrivContent conf
+ , File.ownerGroup conf "znc" "znc"
+ , Cron.job "znconboot" "@reboot" "znc" "~" "znc"
+ , Cron.job "zncrunning" "@hourly" "znc" "~" "znc || true"
+ ]
+ where
+ conf = "/home/znc/.znc/configs/znc.conf"
diff --git a/config-joey.hs b/config-joey.hs
index 38e9b096..c7c3f3be 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -74,8 +74,7 @@ hosts = -- (o) `
& myDnsSecondary
& alias "znc.kitenet.net"
- & Apt.installed ["znc"]
- & User.accountFor "znc"
+ & JoeySites.ircBouncer
-- Nothing is using https on clam, so listen on that port
-- for ssh, for traveling on bad networks.