From 51b3b5a5b8c33ba47cbb11a88f10b83b090155a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jul 2018 13:39:04 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') 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 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/Property/SiteSpecific/JoeySites.hs') 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/Property/SiteSpecific/JoeySites.hs') 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