diff options
| author | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
| commit | b3786c3a74fce6a742649c37ab2ad1255f5864bf (patch) | |
| tree | a5453da91d868781b2339722a4e7bf588993ac09 /makefu/1systems/gum | |
| parent | e6f67aa910f78ecf75f3a47a0794497148c60c2b (diff) | |
| parent | 53855cd2d0dadb159215c5ed12e6d0be02dca98b (diff) | |
Merge remote-tracking branch 'gum/22.05'
Diffstat (limited to 'makefu/1systems/gum')
| -rw-r--r-- | makefu/1systems/gum/config.nix | 25 | ||||
| -rw-r--r-- | makefu/1systems/gum/hetzner/default.nix (renamed from makefu/1systems/gum/hardware-config.nix) | 3 |
2 files changed, 25 insertions, 3 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 540106004..ff0c18795 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -32,8 +32,6 @@ in { # <stockholm/makefu/2configs/stats/netdata-server.nix> <stockholm/makefu/2configs/headless.nix> - <stockholm/makefu/2configs/smart-monitor.nix> - { services.smartd.devices = builtins.map (x: { device = x; }) allDisks; } # Security <stockholm/makefu/2configs/sshd-totp.nix> @@ -135,6 +133,27 @@ in { # <stockholm/makefu/2configs/urlwatch> # Removed until move: avoid letsencrypt ban ### Web + + <stockholm/makefu/2configs/bitwarden.nix> # postgres backend + <stockholm/makefu/2configs/deployment/rss/rss.euer.krebsco.de.nix> # postgres backend + <stockholm/makefu/2configs/deployment/rss/ratt.nix> + + <stockholm/makefu/2configs/deployment/owncloud.nix> #postgres backend + ### Moving owncloud data dir to /media/cloud/nextcloud-data + { + users.users.nextcloud.extraGroups = [ "download" ]; + # nextcloud-setup fails as it cannot set permissions for nextcloud + systemd.services.nextcloud-setup.serviceConfig.SuccessExitStatus = "0 1"; + fileSystems."/var/lib/nextcloud/data" = { + device = "/media/cloud/nextcloud-data"; + options = [ "bind" ]; + }; + fileSystems."/var/backup" = { + device = "/media/cloud/gum-backup"; + options = [ "bind" ]; + }; + } + <stockholm/makefu/2configs/nginx/dl.euer.krebsco.de.nix> #<stockholm/makefu/2configs/nginx/euer.test.nix> <stockholm/makefu/2configs/nginx/euer.mon.nix> @@ -150,7 +169,7 @@ in { # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> <stockholm/makefu/2configs/deployment/graphs.nix> #<stockholm/makefu/2configs/deployment/owncloud.nix> - <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix> + # <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix> #<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de> <stockholm/makefu/2configs/deployment/boot-euer.nix> <stockholm/makefu/2configs/deployment/gecloudpad> diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hetzner/default.nix index 1881329ce..7d445879a 100644 --- a/makefu/1systems/gum/hardware-config.nix +++ b/makefu/1systems/gum/hetzner/default.nix @@ -18,6 +18,9 @@ let ext-if = "et0"; # gets renamed on the fly in { imports = [ + <stockholm/makefu/2configs/smart-monitor.nix> + { services.smartd.devices = builtins.map (x: { device = x; }) allDisks; } + ]; makefu.server.primary-itf = ext-if; services.udev.extraRules = '' |