diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-09-20 11:36:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-20 11:36:44 -0400 |
| commit | 7e28749eff4018ed5b0ef72c4d757a8e4672ef5a (patch) | |
| tree | 828833f0d898726edb75d1d8fcd16b6f4bf48b42 /joeyconfig.hs | |
| parent | 00e2f1aa16b4f569bef06d7c229f0d358dfce741 (diff) | |
| parent | 2f7f02dec0beaa2e13cafbe74e1c2918a2de45fb (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'joeyconfig.hs')
| -rw-r--r-- | joeyconfig.hs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index ab260ee6..15a00f7c 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -457,12 +457,14 @@ pell = host "pell.branchable.com" $ props & Apt.unattendedUpgrades & Branchable.server hosts +-- See https://joeyh.name/code/keysafe/servers/ for requirements. keysafe :: Host keysafe = host "keysafe.joeyh.name" $ props & ipv4 "139.59.17.168" & Hostname.sane & osDebian (Stable "jessie") X86_64 & Apt.stdSourcesList `onChange` Apt.upgrade + & Apt.unattendedUpgrades & DigitalOcean.distroKernel -- This is a 500 mb VM, so need more ram to build propellor. & Apt.serviceInstalledRunning "swapspace" @@ -484,7 +486,28 @@ keysafe = host "keysafe.joeyh.name" $ props & Tor.installed & Tor.hiddenServiceAvailable "keysafe" (Port 4242) `requires` Tor.hiddenServiceData "keysafe" hostContext + & Tor.bandwidthRate (Tor.PerMonth "750 GB") + -- keysafe installed manually until package is available + + & Gpg.keyImported (Gpg.GpgKeyId "CECE11AE") (User "root") + & Ssh.knownHost hosts "usw-s002.rsync.net" (User "root") + & Ssh.userKeys (User "root") + (Context "keysafe.joeyh.name") + [ (SshEd25519, "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEx8bK9ZbXVEgEvxQeXLjnr9cGa/QvoB459aglP529My root@keysafe") + ] + -- Note that this is not an incremental backup; it uploads the + -- whole content every time. So, only run weekly. + & Cron.niceJob "keysafe backup" Cron.Weekly (User "root") "/" backupcmd + `requires` Apt.installed ["rsync"] + where + datadir = "/var/lib/keysafe" + backupdir = "/var/backups/keysafe" + rsyncnetbackup = "2318@usw-s002.rsync.net:keysafe" + backupcmd = unwords + [ "keysafe --store-directory", datadir, "--backup-server", backupdir + , "&& rsync -a --delete --max-delete 3 ", backupdir , rsyncnetbackup + ] iabak :: Host iabak = host "iabak.archiveteam.org" $ props |