From 02d1d7323114986173aeef652d11eb93aeecbd86 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Oct 2018 15:30:14 -0400 Subject: changed wifi interface --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index e7d27de5..d623ec89 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1017,7 +1017,7 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/homepower.joeyh.name/rrds/" homerouterWifiInterface :: String -homerouterWifiInterface = "wlan0" -- "wlx7cdd90400448" is a wifi dongle +homerouterWifiInterface = "wlx7cdd90400448" -- wifi dongle -- My home router, running hostapd and dnsmasq, -- with eth0 connected to a satellite modem, and a fallback ppp connection. -- cgit v1.2.3 From e62d1775f8124dcd473290b20ed5dc551dcd1103 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Oct 2018 15:45:05 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 6a6bcd31..d0f6da2e 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -182,6 +182,7 @@ armAutoBuilder baseautobuilder suite arch flavor = propertyList "arm git-annex autobuilder" $ props & baseautobuilder suite arch flavor -- Works around ghc crash with parallel builds on arm. + & File.dirExists (homedir ".cabal") & (homedir ".cabal" "config") `File.containsLine` "jobs: 1" -- Work around https://github.com/systemd/systemd/issues/7135 -- cgit v1.2.3 From b12a079cd83cad403b8dfce396dbc21ea43823cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Oct 2018 19:15:12 -0400 Subject: no longer need UndecidableInstances here --- src/Propellor/Types/Singletons.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Types/Singletons.hs b/src/Propellor/Types/Singletons.hs index f2089ee8..7788c9aa 100644 --- a/src/Propellor/Types/Singletons.hs +++ b/src/Propellor/Types/Singletons.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, DataKinds, PolyKinds, TypeOperators, TypeFamilies, GADTs, UndecidableInstances #-} +{-# LANGUAGE CPP, DataKinds, PolyKinds, TypeOperators, TypeFamilies, GADTs, FlexibleContexts #-} -- | Simple implementation of singletons, portable back to ghc 7.6.3 -- cgit v1.2.3 From a7b516d91c98760ea68fc38c1c7ad6d367175fd2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 25 Oct 2018 12:06:35 -0400 Subject: propellor spin --- joeyconfig.hs | 12 ++++++++++++ src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/joeyconfig.hs b/joeyconfig.hs index 20c53ff7..86b99f80 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -27,6 +27,7 @@ import qualified Propellor.Property.Locale as Locale import qualified Propellor.Property.Grub as Grub import qualified Propellor.Property.Borg as Borg import qualified Propellor.Property.Gpg as Gpg +import qualified Propellor.Property.OpenId as OpenId import qualified Propellor.Property.Systemd as Systemd import qualified Propellor.Property.Journald as Journald import qualified Propellor.Property.Fail2Ban as Fail2Ban @@ -309,6 +310,7 @@ kite = host "kite.kitenet.net" $ props & JoeySites.kgbServer & Systemd.nspawned ancientKitenet + & Systemd.nspawned openidProvider & alias "podcatcher.kitenet.net" & JoeySites.podcatcher @@ -487,6 +489,16 @@ oldusenetShellBox = Systemd.debContainer "oldusenet-shellbox" $ props & alias "shell.olduse.net" & JoeySites.oldUseNetShellBox +-- My own openid provider. Uses php, so containerized for security +-- and administrative sanity. +openidProvider :: Systemd.Container +openidProvider = Systemd.debContainer "openid-provider" $ props + & standardContainer (Stable "stretch") + & alias hn + & OpenId.providerFor [User "joey", User "liw"] hn (Just (Port 8086)) + where + hn = "openid.kitenet.net" + type Motd = [String] -- This is my standard system setup. diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index d623ec89..9460e787 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -806,7 +806,7 @@ legacyWebSites = propertyList "legacy web sites" $ props , "RewriteRule /~anna/.* http://waldeneffect\\.org/ [R]" , "RewriteRule /~anna/.* http://waldeneffect\\.org/ [R]" , "RewriteRule /~anna http://waldeneffect\\.org/ [R]" - , "RewriteRule /simpleid/ http://openid.kitenet.net:8081/simpleid/" + , "RewriteRule /simpleid/ http://openid.kitenet.net:8086/simpleid/" , "# Even the kite home page is not here any more!" , "RewriteRule ^/$ http://www.kitenet.net/ [R]" , "RewriteRule ^/index.html http://www.kitenet.net/ [R]" -- cgit v1.2.3 From 619c60aa620ecef09258ddcebba24a9f2e2366ba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 27 Oct 2018 16:03:37 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 9460e787..0ed7a629 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -585,10 +585,18 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props & "/etc/pine.conf" `File.hasContent` [ "# deployed with propellor" , "inbox-path={localhost}inbox" - , "rsh-command=/usr/lib/dovecot/imap" + , "rsh-command=" ++ imapalpinescript ] `describe` "pine configured to use local imap server" - + & imapalpinescript `File.hasContent` + [ "#!/bin/sh" + , "# deployed with propellor" + , "set -e" + , "exec /usr/lib/dovecot/imap 2>/dev/null" + ] + `onChange` (imapalpinescript `File.mode` + combineModes (readModes ++ executeModes)) + `describe` "imap script for pine" & Apt.serviceInstalledRunning "mailman" -- Override the default http url. (Only affects new lists.) & "/etc/mailman/mm_cfg.py" `File.containsLine` @@ -600,6 +608,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props where ctx = Context "kitenet.net" pinescript = "/usr/local/bin/pine" + imapalpinescript = "/usr/local/bin/imap-for-alpine" dovecotusers = "/etc/dovecot/users" ssmtp = Postfix.Service -- cgit v1.2.3 From c524ff95b0b31c524943b37c3fb20213bb9b9586 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 31 Oct 2018 09:21:33 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index d0f6da2e..8a9f913b 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -122,9 +122,9 @@ standardAutoBuilder suite arch flavor = & Apt.stdSourcesList & Apt.unattendedUpgrades & Apt.cacheCleaned - & buildDepsApt & User.accountFor (User builduser) & tree (architectureToDebianArchString arch) flavor + & buildDepsApt stackAutoBuilder :: DebianSuite -> Architecture -> Flavor -> Property (HasInfo + Debian) stackAutoBuilder suite arch flavor = -- cgit v1.2.3