summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-12-29 12:03:01 -0400
committerJoey Hess2017-12-29 12:03:01 -0400
commitc330c878aac7d6c7890d778dc6df18176409a76e (patch)
treeae4b0e7cc5a6897badd2afe22ea4691c9ce734b7
parent9a6674a887f1e8364d60169a47a52c35acad06f4 (diff)
parent0db0886df498b1f7d6d0c1cc74adaa147978cddb (diff)
Merge branch 'joeyconfig'
-rw-r--r--joeyconfig.hs11
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs44
2 files changed, 49 insertions, 6 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index cb619186..fb26ce6c 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -32,7 +32,6 @@ import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.Journald as Journald
import qualified Propellor.Property.Fail2Ban as Fail2Ban
-import qualified Propellor.Property.Aiccu as Aiccu
import qualified Propellor.Property.OS as OS
import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
import qualified Propellor.Property.HostingProvider.Linode as Linode
@@ -86,20 +85,20 @@ darkstar :: Host
darkstar = host "darkstar.kitenet.net" $ props
& osDebian Unstable X86_64
& ipv6 "2001:4830:1600:187::2"
- & Aiccu.hasConfig "T18376" "JHZ2-SIXXS"
-
- & User.nuked (User "nosuchuser") User.YesReallyDeleteHome
+ & Hostname.sane
+ & Apt.serviceInstalledRunning "swapspace"
& JoeySites.dkimMilter
& JoeySites.postfixSaslPasswordClient
-- & JoeySites.alarmClock "*-*-* 7:30" (User "joey")
-- "/usr/bin/timeout 45m /home/joey/bin/goodmorning"
+ & JoeySites.laptopSoftware
& Ssh.userKeys (User "joey") hostContext
[ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar")
]
-- & imageBuiltFor honeybee
- -- (RawDiskImage "/srv/honeybee.img")
- -- (Debootstrapped mempty)
+ -- (RawDiskImage "/srv/honeybee.img")
+ -- (Debootstrapped mempty)
gnu :: Host
gnu = host "gnu.kitenet.net" $ props
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index a4357101..019d2209 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1033,3 +1033,47 @@ ipmasq intif = File.hasContent ifupscript
ifupscript = "/etc/network/if-up.d/ipmasq"
pppupscript = "/etc/ppp/ip-up.d/ipmasq"
scriptmode f = f `File.mode` combineModes (readModes ++ executeModes)
+
+laptopSoftware :: Property DebianLike
+laptopSoftware = Apt.installed
+ [ "procmeter3", "xfce4", "procmeter3", "unclutter"
+ , "mplayer", "fbreader", "firefox", "chromium"
+ , "libdatetime-event-sunrise-perl", "libtime-duration-perl"
+ , "iftop", "network-manager", "gtk-redshift", "powertop"
+ , "gimp", "gthumb", "inkscape", "sozi", "xzgv", "hugin"
+ , "mpc", "mpd", "ncmpc", "sonata", "mpdtoys"
+ , "bsdgames", "nethack"
+ , "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev"
+ , "ttf-bitstream-vera"
+ , "mairix", "offlineimap", "mutt"
+ , "nmap"
+ , "udevil", "pmount"
+ , "arbtt", "hledger"
+ , "apache2", "ikiwiki", "libhighlight-perl"
+ , "pal"
+ , "yeahconsole", "xkbset", "xinput"
+ , "assword", "pumpa", "vorbis-tools"
+ , "xul-ext-ublock-origin", "xul-ext-pdf.js", "xul-ext-status4evar"
+ , "vim-syntastic", "vim-fugitive"
+ , "adb", "gthumb"
+ , "w3m", "sm", "weechat"
+ , "borgbackup"
+ ]
+ `requires` baseSoftware
+ `requires` devSoftware
+
+baseSoftware :: Property DebianLike
+baseSoftware = Apt.installed
+ [ "bash", "bash-completion", "vim", "screen", "less", "moreutils"
+ , "git", "mr", "etckeeper", "git-annex", "ssh", "vim-vimoutliner"
+ ]
+
+devSoftware :: Property DebianLike
+devSoftware = Apt.installed
+ [ "build-essential", "debhelper", "devscripts"
+ , "ghc", "cabal-install", "haskell-stack"
+ , "hothasktags", "hdevtools", "hlint"
+ , "gdb", "dpkg-repack", "lintian"
+ , "pristine-tar", "github-backup"
+ , "kvm"
+ ]