summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Dns.hs5
-rw-r--r--src/Propellor/Property/Docker.hs4
-rw-r--r--src/Propellor/Property/HostingProvider/CloudAtCost.hs6
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
4 files changed, 14 insertions, 8 deletions
diff --git a/src/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs
index 8e38a75e..18fe1749 100644
--- a/src/Propellor/Property/Dns.hs
+++ b/src/Propellor/Property/Dns.hs
@@ -323,11 +323,6 @@ rValue (SSHFP x y s) = Just $ unwords
]
rValue (INCLUDE f) = Just f
rValue (TXT s) = Just $ zoneFileString s
- where
- op = '('
- cp = ')'
- w = ' '
- q = '"'
rValue (PTR _) = Nothing
-- Bind has a limit on the length of a string in its zone file,
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 66418253..6aeec5fa 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -1,6 +1,8 @@
{-# LANGUAGE FlexibleContexts, TypeSynonymInstances, FlexibleInstances, TypeFamilies #-}
--- | Docker support for propellor
+-- | Maintainer: currently unmaintained; your name here!
+--
+-- Docker support for propellor
--
-- The existance of a docker container is just another Property of a system,
-- which propellor can set up. See config.hs for an example.
diff --git a/src/Propellor/Property/HostingProvider/CloudAtCost.hs b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
index 5c4788e2..48c19572 100644
--- a/src/Propellor/Property/HostingProvider/CloudAtCost.hs
+++ b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
@@ -1,4 +1,8 @@
-module Propellor.Property.HostingProvider.CloudAtCost where
+-- | Maintainer: currently unmaintained; your name here!
+
+module Propellor.Property.HostingProvider.CloudAtCost
+ {-# WARNING "This module does not have a maintainer. It might not work right anymore. If you use it, please consider becoming its maintainer." #-}
+ where
import Propellor.Base
import qualified Propellor.Property.Hostname as Hostname
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index ff2fab79..07a595d7 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -932,6 +932,9 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props
& User.hasGroup user (Group "dialout")
& Group.exists (Group "gpio") Nothing
& User.hasGroup user (Group "gpio")
+ & Apt.installed ["i2c-tools"]
+ & User.hasGroup user (Group "i2c")
+ & "/etc/modules-load.d/homepower.conf" `File.hasContent` ["i2c-dev"]
& Cron.niceJob "homepower upload"
(Cron.Times "1 * * * *") user d rsynccommand
`requires` Ssh.userKeyAt (Just sshkeyfile) user ctx sshkey
@@ -958,6 +961,7 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props
, "libghc-wai-dev"
, "libghc-warp-dev"
, "libghc-http-client-dev"
+ , "libghc-http-client-tls-dev"
, "libghc-reactive-banana-dev"
, "libghc-hinotify-dev"
]
@@ -1123,7 +1127,8 @@ laptopSoftware = Apt.installed
, "procmeter3", "xfce4", "procmeter3", "unclutter"
, "mplayer", "fbreader", "firefox", "chromium"
, "libdatetime-event-sunrise-perl", "libtime-duration-perl"
- , "network-manager", "gtk-redshift", "powertop"
+ , "network-manager", "network-manager-openvpn-gnome", "openvpn"
+ , "gtk-redshift", "powertop"
, "gimp", "gthumb", "inkscape", "sozi", "xzgv", "hugin"
, "mpc", "mpd", "ncmpc", "sonata", "mpdtoys"
, "bsdgames", "nethack-console"