From da7ae2521482b04a3813db964074b638c91b7d6a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 09:34:09 -0300 Subject: propellor spin --- config-joey.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index a35f77bd..d4b44834 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -72,14 +72,18 @@ hosts = -- (o) ` & alias "ns9.kitenet.net" & myDnsSecondary - - & Docker.garbageCollected `period` Daily - & Apt.installed ["git-annex", "mtr", "screen"] + + & alias "znc.kitenet.net" + & Apt.installed ["znc"] + & User.accountFor "znc" -- Nothing is using https on clam, so listen on that port -- for ssh, for traveling on bad networks. & "/etc/ssh/sshd_config" `File.containsLine` "Port 443" `onChange` Service.restarted "ssh" + + & Docker.garbageCollected `period` Daily + & Apt.installed ["git-annex", "mtr", "screen"] -- Orca is the main git-annex build box. , standardSystem "orca.kitenet.net" Unstable "amd64" -- cgit v1.3-2-g0d8e From 904c58262a75e877dac30f393d6fcf2e96778412 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 10:17:39 -0300 Subject: propellor spin --- config-joey.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index d4b44834..38e9b096 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -334,6 +334,7 @@ monsters = -- but do want to track their public keys etc. & alias "joey.kitenet.net" & alias "annex.kitenet.net" & alias "ipv6.kitenet.net" + & alias "bitlbee.kitenet.net" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" , host "beaver.kitenet.net" -- cgit v1.3-2-g0d8e From 26254bf8c79a83bc5e76deea81a3cabfaec6c8b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 May 2014 10:31:30 -0300 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 12 ++++++++++++ config-joey.hs | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'config-joey.hs') 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. -- cgit v1.3-2-g0d8e