From 4f925f982a2740f4751fce4f138bde485077e22e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 May 2015 00:20:05 -0400 Subject: refactor --- src/Propellor/Property/SiteSpecific/Branchable.hs | 66 +++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/Propellor/Property/SiteSpecific/Branchable.hs (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/Branchable.hs b/src/Propellor/Property/SiteSpecific/Branchable.hs new file mode 100644 index 00000000..f5950e52 --- /dev/null +++ b/src/Propellor/Property/SiteSpecific/Branchable.hs @@ -0,0 +1,66 @@ +module Propellor.Property.SiteSpecific.Branchable where + +import Propellor +import qualified Propellor.Property.Apt as Apt +import qualified Propellor.Property.File as File +import qualified Propellor.Property.User as User +import qualified Propellor.Property.Ssh as Ssh +import qualified Propellor.Property.Postfix as Postfix +import qualified Propellor.Property.Gpg as Gpg +import qualified Propellor.Property.Sudo as Sudo + +server :: [Host] -> Property HasInfo +server hosts = propertyList "branchable server" $ props + & "/etc/timezone" `File.hasContent` ["Etc/UTC"] + & "/etc/locale.gen" `File.containsLines` + [ "en_GB.UTF-8 UTF-8" + , "en_US.UTF-8 UTF-8" + , "fi_FI.UTF-8 UTF-8" + ] + `onChange` cmdProperty "locale-gen" [] + + & Apt.installed ["etckeeper", "ssh", "popularity-contest"] + & Apt.serviceInstalledRunning "apache2" + & Apt.serviceInstalledRunning "ntp" + + & Apt.serviceInstalledRunning "openssh-server" + & Ssh.passwordAuthentication False + & Ssh.hostKeys (Context "branchable.com") + [ (SshDsa, "ssh-dss AAAAB3NzaC1kc3MAAACBAK9HnfpyIm8aEhKuF5oz6KyaLwFs2oWeToVkqVuykyy5Y8jWDZPtkpv+1TeOnjcOvJSZ1cCqB8iXlsP9Dr5z98w5MfzsRQM2wIw0n+wvmpPmUhjVdGh+wTpfP9bcyFHhj/f1Ymdq9hEWB26bnf4pbTbJW2ip8ULshMvn5CQ/ugV3AAAAFQCAjpRd1fquRiIuLJMwej0VcyoZKQAAAIBe91Grvz/icL3nlqXYrifXyr9dsw8bPN+BMu+hQtFsQXNJBylxwf8FtbRlmvZXmRjdVYqFVyxSsrL2pMsWlds51iXOr9pdsPG5a4OgJyRHsveBz3tz6HgYYPcr3Oxp7C6G6wrzwsaGK862SgRp/bbD226k9dODRBy3ogMhk/MvAgAAAIEApfknql3vZbDVa88ZnwbNKDOv8L1hb6blbKAMt2vJbqJMvu3EP9CsP9hGyEQh5YCAl2F9KEU3bJXN1BG76b7CiYtWK95lpL1XmCCWnJBCcdEhw998GfJS424frPw7qGmXLxJKYxEyioB90/IDp2dC+WaLcLOYHM9SroCQTIK5A1g= root@pell") + , (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1M0aNLgcgcgf0tkmt/8vCDZLok8Xixz7Nun9wB6NqVXxfzAR4te+zyO7FucVwyTY5QHmiwwpmyNfaC21AAILhXGm12SUKSAirF9BkQk7bhQuz4T/dPlEt3d3SxQ3OZlXtPp4LzXWOyS0OXSzIb+HeaDA+hFXlQnp/gE7RyAzR1+xhWPO7Mz1q5O/+4dXANnW32t6P7Puob6NsglVDpLrMRYjkO+0RgCVbYMzB5+UnkthkZsIINaYwsNhW2GKMKbRZeyp5en5t1NJprGXdw0BqdBqd/rcBpOxmhHE1U7rw+GS1uZwCFWWv0aZbaXEJ6wY7mETFkqs0QXi5jtoKn95Gw== root@pell") + ] + + & Apt.installed ["procmail", "bsd-mailx"] + & "/etc/aliases" `File.hasPrivContentExposed` (Context "branchable.com") + `onChange` Postfix.newaliases + & "/etc/mailname" `File.hasContent` ["branchable.com"] + & Postfix.installed + & Postfix.mainCf ("mailbox_command", "procmail -a \"$EXTENSION\"") + + -- Obnam is run by a cron job in ikiwiki-hosting. + & "/etc/obnam.conf" `File.hasContent` + [ "[config]" + , "repository = sftp://joey@eubackup.kitenet.net/home/joey/lib/backup/pell.obnam" + , "log = /var/log/obnam.log" + , "encrypt-with = " ++ obnamkey + , "log-level = info" + , "log-max = 1048576" + , "keep = 7d,5w,12m" + , "upload-queue-size = 128" + , "lru-size = 128" + ] + & Gpg.keyImported (Gpg.GpgKeyId obnamkey) (User "root") + & Ssh.keyImported SshRsa (User "root") (Context "branchable.com") + & Ssh.knownHost hosts "eubackup.kitenet.net" (User "root") + & Ssh.knownHost hosts "usw-s002.rsync.net" (User "root") + + & adminuser "joey" + & adminuser "liw" + where + obnamkey = "41E1A9B9" + adminuser u = propertyList ("admin user " ++ u) $ props + & User.accountFor (User u) + & User.hasSomePassword (User u) + & Sudo.enabledFor (User u) + & User.hasGroup (User u) (Group "adm") + & User.hasGroup (User u) (Group "systemd-journal") -- cgit v1.2.3 From ad3cc3e00d33fc3a46d1b345316bfc9f7879fe95 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 May 2015 09:44:40 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 12629e2c..36808919 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -470,7 +470,7 @@ backupsBackedupFrom hosts srchost destdir = Cron.niceJob desc `requires` Ssh.knownHost hosts srchost (User "joey") where desc = "backups copied from " ++ srchost ++ " on boot" - cmd = "rsync -az --bwlimit=300K --partial --delete " ++ srchost ++ ":lib/backup/ " ++ destdir srchost + cmd = "sleep 30m && rsync -az --bwlimit=300K --partial --delete " ++ srchost ++ ":lib/backup/ " ++ destdir srchost obnamRepos :: [String] -> Property NoInfo obnamRepos rs = propertyList ("obnam repos for " ++ unwords rs) -- cgit v1.2.3 From de07d0f7209372c3d339e34ba86986877f6c80ab Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 May 2015 11:03:17 -0400 Subject: propellor spin --- config-joey.hs | 1 + src/Propellor/Property/SiteSpecific/IABak.hs | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/config-joey.hs b/config-joey.hs index cf07dd9f..2a173776 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -364,6 +364,7 @@ iabak = host "iabak.archiveteam.org" & IABak.gitServer monsters & IABak.registrationServer monsters & IABak.graphiteServer + & IABak.publicFace where admins = map User ["joey", "db48x"] diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index 650014f4..fc56de85 100644 --- a/src/Propellor/Property/SiteSpecific/IABak.hs +++ b/src/Propellor/Property/SiteSpecific/IABak.hs @@ -15,6 +15,13 @@ repo = "https://github.com/ArchiveTeam/IA.BAK/" userrepo :: String userrepo = "git@gitlab.com:archiveteam/IA.bak.users.git" +publicFace :: Property HasInfo +publicFace = propertyList "iabak public face" $ props + & Git.cloned (User "root") repo "/usr/local/IA.BAK" (Just "server") + & Apt.serviceInstalledRunning "apache2" + & Cron.niceJob "graph-gen" (Cron.Times "*/10 * * * *") (User "root") "/" + "/usr/local/IA.BAK/web/graph-gen.sh" + gitServer :: [Host] -> Property HasInfo gitServer knownhosts = propertyList "iabak git server" $ props & Git.cloned (User "root") repo "/usr/local/IA.BAK" (Just "server") -- cgit v1.2.3 From e661aad6c493e31b6bd8109ca3d5c90bec28626a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 May 2015 13:34:20 -0400 Subject: merge --- src/Propellor/Property/SiteSpecific/IABak.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific') diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index fc56de85..fe2de7c8 100644 --- a/src/Propellor/Property/SiteSpecific/IABak.hs +++ b/src/Propellor/Property/SiteSpecific/IABak.hs @@ -63,12 +63,14 @@ graphiteServer = propertyList "iabak graphite server" $ props [ "[carbon]" , "pattern = ^carbon\\." , "retentions = 60:90d" - , "[iabak]" + , "[iabak-connections]" + , "pattern = ^iabak\\.shardstats\\.connections" + , "retentions = 1h:1y,3h:10y" + , "[iabak-default]" , "pattern = ^iabak\\." - , "retentions = 10m:30d,1h:1y,3h,10y" + , "retentions = 10m:30d,1h:1y,3h:10y" , "[default_1min_for_1day]" , "pattern = .*" - , "retentions = 60s:1d" ] & graphiteCSRF & cmdProperty "graphite-manage" ["syncdb", "--noinput"] `flagFile` "/etc/flagFiles/graphite-syncdb" -- cgit v1.2.3