summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2018-11-05 13:05:04 -0400
committerJoey Hess2018-11-05 13:05:04 -0400
commit92a9df3ae5ab3681924ea772c965f28e08b7563f (patch)
treea95e27b0712fb95bd809fe6c229e68f85ef01970 /src/Propellor/Property
parentaa9c5e0f10677786c7bb9a3d45844fa0c6bbf06b (diff)
parentb9d9cf7a42f13622a651aea07f791af2fc885404 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs17
2 files changed, 15 insertions, 5 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 6a6bcd31..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 =
@@ -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
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e7d27de5..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
@@ -806,7 +815,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]"
@@ -1017,7 +1026,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.