summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
2 files changed, 3 insertions, 2 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 257d859a..fa312f1c 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -232,7 +232,6 @@ kite = host "kite.kitenet.net" $ props
& ipv4 "66.228.36.95"
& ipv6 "2600:3c03::f03c:91ff:fe73:b0d2"
& alias "kitenet.net"
- & alias "wren.kitenet.net" -- temporary
& Ssh.hostKeys (Context "kitenet.net")
[ (SshDsa, "ssh-dss AAAAB3NzaC1kc3MAAACBAO9tnPUT4p+9z7K6/OYuiBNHaij4Nzv5YVBih1vMl+ALz0gYAj8RWJzXmqp5buFAyfgOoLw+H9s1bBS01Sy3i07Dm6cx1fWG4RXL/E/3w1tavX99GD2bBxDBu890ebA5Tp+eFRJkS9+JwSvFiF6CP7NbVjifCagoUO56Ig048RwDAAAAFQDPY2xM3q6KwsVQliel23nrd0rV2QAAAIEAga3hj1hL00rYPNnAUzT8GAaSP62S4W68lusErH+KPbsMwFBFY/Ib1FVf8k6Zn6dZLh/HH/RtJi0JwdzPI1IFW+lwVbKfwBvhQ1lw9cH2rs1UIVgi7Wxdgfy8gEWxf+QIqn62wG+Ulf/HkWGvTrRpoJqlYRNS/gnOWj9Z/4s99koAAACBAM/uJIo2I0nK15wXiTYs/NYUZA7wcErugFn70TRbSgduIFH6U/CQa3rgHJw9DCPCQJLq7pwCnFH7too/qaK+czDk04PsgqV0+Jc7957gU5miPg50d60eJMctHV4eQ1FpwmGGfXxRBR9k2ZvikWYatYir3L6/x1ir7M0bA9IzNU45")
, (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA2QAJEuvbTmaN9ex9i9bjPhMGj+PHUYq2keIiaIImJ+8mo+yKSaGUxebG4tpuDPx6KZjdycyJt74IXfn1voGUrfzwaEY9NkqOP3v6OWTC3QeUGqDCeJ2ipslbEd9Ep9XBp+/ldDQm60D0XsIZdmDeN6MrHSbKF4fXv1bqpUoUILk=")
@@ -242,6 +241,7 @@ kite = host "kite.kitenet.net" $ props
& Network.preserveStatic "eth0" `requires` Network.cleanInterfacesFile
& Apt.installed ["linux-image-amd64"]
+ & Apt.serviceInstalledRunning "swapspace"
& Linode.serialGrub
& Linode.mlocateEnabled
& Apt.unattendedUpgrades
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e45b1ffa..8aa2f3bd 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1040,7 +1040,7 @@ ipmasq intif = File.hasContent ifupscript
laptopSoftware :: Property DebianLike
laptopSoftware = Apt.installed
- [ "intel-microcode"
+ [ "intel-microcode", "acpi"
, "procmeter3", "xfce4", "procmeter3", "unclutter"
, "mplayer", "fbreader", "firefox", "chromium"
, "libdatetime-event-sunrise-perl", "libtime-duration-perl"
@@ -1055,6 +1055,7 @@ laptopSoftware = Apt.installed
, "pmount", "tree", "pv"
, "arbtt", "hledger", "bc"
, "apache2", "ikiwiki", "libhighlight-perl"
+ , "avahi-daemon", "avahi-discover"
, "pal"
, "yeahconsole", "xkbset", "xinput"
, "assword", "pumpa"