From 58a7ba614753e5462b08ef91dd2663e70cd7742c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 12:05:37 -0400 Subject: two unmaintained modules --- src/Propellor/Property/Docker.hs | 7 +++++-- src/Propellor/Property/HostingProvider/CloudAtCost.hs | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 66418253..522aecd9 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -1,11 +1,14 @@ {-# 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. -module Propellor.Property.Docker ( +module Propellor.Property.Docker + {-# WARNING "This module does not have a maintainer. It might not work right anymore. If you use it, please consider becoming its maintainer." #-} ( -- * Host properties installed, configured, 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 -- cgit v1.2.3 From 51b3b5a5b8c33ba47cbb11a88f10b83b090155a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 13:39:04 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- src/Propellor/Property/SiteSpecific/JoeySites.hs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Propellor') diff --git a/joeyconfig.hs b/joeyconfig.hs index 7541c78b..2c6d77e1 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -98,7 +98,7 @@ clam :: Host clam = host "clam.kitenet.net" $ props & standardSystem Unstable X86_64 ["Unreliable server. Anything here may be lost at any time!" ] - & ipv4 "64.137.164.186" + & ipv4 "167.114.76.178" & User.hasPassword (User "root") & Ssh.hostKeys hostContext diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index ff2fab79..da103a82 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1123,7 +1123,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" -- cgit v1.2.3 From 31358ddffc4240d0ff602d9a872fd89f06508d45 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 13:39:11 -0400 Subject: remove unused values --- src/Propellor/Property/Dns.hs | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/Propellor') 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, -- cgit v1.2.3 From dce951917274b5af0d342d895346f26003e3749c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 13:45:30 -0400 Subject: propellor spin --- src/Propellor/Spin.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 4a945e82..d3d18b9e 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -144,8 +144,12 @@ spin' mprivdata relay target hst = do -- the host in it at all, use one of the Host's IPs instead. getSshTarget :: HostName -> Host -> IO String getSshTarget target hst - | null configips = return target - | otherwise = go =<< tryIO (dnslookup target) + | null configips = do + print "no configured IPs" + return target + | otherwise = do + print configips + go =<< tryIO (dnslookup target) where go (Left e) = useip (show e) go (Right addrinfos) = do -- cgit v1.2.3 From b23f0cf501464bb76d78814aed787284cd6c0cfa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 13:46:38 -0400 Subject: remove debug print --- src/Propellor/Spin.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index d3d18b9e..4a945e82 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -144,12 +144,8 @@ spin' mprivdata relay target hst = do -- the host in it at all, use one of the Host's IPs instead. getSshTarget :: HostName -> Host -> IO String getSshTarget target hst - | null configips = do - print "no configured IPs" - return target - | otherwise = do - print configips - go =<< tryIO (dnslookup target) + | null configips = return target + | otherwise = go =<< tryIO (dnslookup target) where go (Left e) = useip (show e) go (Right addrinfos) = do -- cgit v1.2.3 From 6387e7db95a584ce426e22c2112e781ed2d4e14c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 14:03:35 -0400 Subject: remove build-time warning for docker Propellor.Cmdline imports it, which made propellor compilation warn. --- debian/changelog | 2 +- src/Propellor/Property/Docker.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Propellor') diff --git a/debian/changelog b/debian/changelog index 468fdaee..2c481cb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ propellor (5.4.1) UNRELEASED; urgency=medium * Dns: Support TXT values longer than bind's maximum string length of 255 bytes. Thanks, rsiddharth. * Docker and HostingProvider.CloudAtCost modules are not being - maintained, so marked them as such, including build-time warnings. + maintained, so marked them as such. Seeking a maintainer for the Docker module; I anticipate removing the CloudAtCost module in the next API bump. diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 522aecd9..6aeec5fa 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -7,8 +7,7 @@ -- The existance of a docker container is just another Property of a system, -- which propellor can set up. See config.hs for an example. -module Propellor.Property.Docker - {-# WARNING "This module does not have a maintainer. It might not work right anymore. If you use it, please consider becoming its maintainer." #-} ( +module Propellor.Property.Docker ( -- * Host properties installed, configured, -- cgit v1.2.3 From ee3a46be77b479a2d2869af2afffb683f8426cce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Jul 2018 11:51:33 -0400 Subject: updates --- joeyconfig.hs | 1 + src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 + 2 files changed, 2 insertions(+) (limited to 'src/Propellor') diff --git a/joeyconfig.hs b/joeyconfig.hs index ffbe957b..08a01e09 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -184,6 +184,7 @@ honeybee = host "honeybee.kitenet.net" $ props ) & JoeySites.cubieTruckOneWire & Apt.installed ["i2c-tools"] + & User "joey" `hasGroup` Group "i2c" & Apt.installed ["firmware-brcm80211"] -- Workaround for https://bugs.debian.org/844056 diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index da103a82..7845e226 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -958,6 +958,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" ] -- cgit v1.2.3 From 6b58f1313287906b920fe379df4773261a1e859d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Jul 2018 14:10:02 -0400 Subject: update --- joeyconfig.hs | 2 -- src/Propellor/Property/SiteSpecific/JoeySites.hs | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Propellor') diff --git a/joeyconfig.hs b/joeyconfig.hs index 08a01e09..7581b3ec 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -183,8 +183,6 @@ honeybee = host "honeybee.kitenet.net" $ props `setSize` MegaBytes 8000 ) & JoeySites.cubieTruckOneWire - & Apt.installed ["i2c-tools"] - & User "joey" `hasGroup` Group "i2c" & Apt.installed ["firmware-brcm80211"] -- Workaround for https://bugs.debian.org/844056 diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 7845e226..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 -- cgit v1.2.3