From 885fa09d1a4e39cd3dbe68d8e40f0365f2757979 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2015 11:14:59 -0400 Subject: propellor spin --- config-joey.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 36378366..5f474a12 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -314,6 +314,10 @@ iabak = host "ia-bak.joeyh.name" & User.hasSomePassword "joey" & Sudo.enabledFor "joey" & GitHome.installedFor "joey" + & Git.cloned "root" repo "/usr/local/IA.BAK" (Just "server") + & Git.cloned "root" repo "/usr/local/IA.BAK/pubkeys" (Just "pubkeys") + where + repo = "https://github.com/ArchiveTeam/IA.BAK/" --' __|II| ,. ---- __|II|II|__ ( \_,/\ -- cgit v1.2.3 From 85b01d02ed705a0c454fd093968a7fd0d08aa8ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2015 11:22:31 -0400 Subject: propellor spin --- config-joey.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 5f474a12..ef90a469 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -315,7 +315,9 @@ iabak = host "ia-bak.joeyh.name" & Sudo.enabledFor "joey" & GitHome.installedFor "joey" & Git.cloned "root" repo "/usr/local/IA.BAK" (Just "server") - & Git.cloned "root" repo "/usr/local/IA.BAK/pubkeys" (Just "pubkeys") + & Git.cloned "root" repo "/usr/local/IA.BAK/pubkeys" (Just "pubkey") + & Apt.serviceInstalledRunning "apache2" + & cmdProperty "ln" ["-s", "/usr/local/IA.BAK/pushme.cgi", "/usr/lib/cgi-bin/pushme.cgi"] where repo = "https://github.com/ArchiveTeam/IA.BAK/" -- cgit v1.2.3 From 16172a6485d0b859b71dacada85595647f456823 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2015 11:37:18 -0400 Subject: propellor spin --- config-joey.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index ef90a469..10b363a5 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -315,9 +315,11 @@ iabak = host "ia-bak.joeyh.name" & Sudo.enabledFor "joey" & GitHome.installedFor "joey" & Git.cloned "root" repo "/usr/local/IA.BAK" (Just "server") - & Git.cloned "root" repo "/usr/local/IA.BAK/pubkeys" (Just "pubkey") + & Git.cloned "www-data" repo "/usr/local/IA.BAK/pubkeys" (Just "pubkey") & Apt.serviceInstalledRunning "apache2" & cmdProperty "ln" ["-s", "/usr/local/IA.BAK/pushme.cgi", "/usr/lib/cgi-bin/pushme.cgi"] + & Apt.installed ["sudo"] + & File.containsLine "/etc/sudoers" "www-data ALL=NOPASSWD:/usr/local/IA.BAK/pushed.sh" where repo = "https://github.com/ArchiveTeam/IA.BAK/" -- cgit v1.2.3 From 0886c13ee6495010cb236c2c6dddf17d617aeb4f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2015 12:26:23 -0400 Subject: propellor spin --- config-joey.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 10b363a5..3b30daed 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -305,6 +305,7 @@ beaver = host "beaver.kitenet.net" iabak :: Host iabak = host "ia-bak.joeyh.name" & ipv4 "124.6.40.227" + & os (System (Debian Testing) "amd64") & Apt.installed ["git"] & Apt.installed ["etckeeper"] & Apt.installed ["ssh"] @@ -317,9 +318,11 @@ iabak = host "ia-bak.joeyh.name" & Git.cloned "root" repo "/usr/local/IA.BAK" (Just "server") & Git.cloned "www-data" repo "/usr/local/IA.BAK/pubkeys" (Just "pubkey") & Apt.serviceInstalledRunning "apache2" - & cmdProperty "ln" ["-s", "/usr/local/IA.BAK/pushme.cgi", "/usr/lib/cgi-bin/pushme.cgi"] + & cmdProperty "ln" ["-sf", "/usr/local/IA.BAK/pushme.cgi", "/usr/lib/cgi-bin/pushme.cgi"] & Apt.installed ["sudo"] & File.containsLine "/etc/sudoers" "www-data ALL=NOPASSWD:/usr/local/IA.BAK/pushed.sh" + & Cron.niceJob "shardstats" (Cron.Times "*/30 * * * *") "root" "/" + "/usr/local/IA.BAK/shardstats SHARD1" where repo = "https://github.com/ArchiveTeam/IA.BAK/" -- cgit v1.2.3 From d19966a95db288eeb453536cb856a8362aab9ea2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2015 12:27:43 -0400 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 3b30daed..222cb1ed 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -306,6 +306,7 @@ iabak :: Host iabak = host "ia-bak.joeyh.name" & ipv4 "124.6.40.227" & os (System (Debian Testing) "amd64") + & Apt.stdSourcesList `onChange` Apt.upgrade & Apt.installed ["git"] & Apt.installed ["etckeeper"] & Apt.installed ["ssh"] -- cgit v1.2.3 From 8690fea4da3c3f5eb4e50e2a88483eeb66e01fa3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2015 21:13:35 -0400 Subject: rename --- config-joey.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 222cb1ed..5b134c45 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -303,7 +303,8 @@ beaver = host "beaver.kitenet.net" "rsync -a -x / /home/joey/lib/backup/beaver.kitenet.net/" iabak :: Host -iabak = host "ia-bak.joeyh.name" +iabak = host "iabak.archiveteam.org" + & aias "ia-bak.joeyh.name" & ipv4 "124.6.40.227" & os (System (Debian Testing) "amd64") & Apt.stdSourcesList `onChange` Apt.upgrade -- cgit v1.2.3