From 5469e9e37abc4497d4e6793dc5465f208031c53d Mon Sep 17 00:00:00 2001 From: kat witch Date: Sat, 18 Sep 2021 03:30:55 +0100 Subject: [PATCH] services -> less folders where possible --- config/hosts/daiyousei.nix | 2 +- config/hosts/kyouko.nix | 5 +-- .../default.nix => dht22-exporter.nix} | 0 .../default.nix => dnscrypt-proxy.nix} | 0 config/services/filehost/default.nix | 17 -------- .../{fusionpbx/default.nix => fusionpbx.nix} | 0 .../{glauth/default.nix => glauth.nix} | 0 .../{jellyfin/default.nix => jellyfin.nix} | 0 .../{katsplash/default.nix => katsplash.nix} | 0 .../default.nix => kattv-ingest.nix} | 0 .../services/{kattv/default.nix => kattv.nix} | 0 .../{keycloak/default.nix => keycloak.nix} | 0 .../{logrotate/default.nix => logrotate.nix} | 0 config/services/mail/default.nix | 1 + .../default.nix => mail/roundcube.nix} | 0 .../{murmur/default.nix => murmur.nix} | 0 config/services/{nfs/default.nix => nfs.nix} | 0 .../services/{nginx/default.nix => nginx.nix} | 0 .../default.nix => nixos-mailserver.nix.old} | 0 .../{postgres/default.nix => postgres.nix} | 0 .../{prosody/default.nix => prosody.nix} | 0 config/services/radicale/default.nix | 43 ------------------- .../{restic/default.nix => restic.nix} | 0 .../{matrix/default.nix => synapse.nix} | 0 .../{syncplay/default.nix => syncplay.nix} | 0 .../default.nix => taskserver.nix} | 0 .../default.nix => transmission.nix} | 0 .../{tvheadend/default.nix => tvheadend.nix} | 0 .../default.nix => vaultwarden.nix} | 0 .../{vikunja/default.nix => vikunja.nix} | 0 .../{website/default.nix => website.nix} | 0 .../{weechat/default.nix => weechat.nix} | 0 config/services/{zfs/default.nix => zfs.nix} | 0 config/services/{znc/default.nix => znc.nix} | 0 34 files changed, 3 insertions(+), 65 deletions(-) rename config/services/{dht22-exporter/default.nix => dht22-exporter.nix} (100%) rename config/services/{dnscrypt-proxy/default.nix => dnscrypt-proxy.nix} (100%) delete mode 100644 config/services/filehost/default.nix rename config/services/{fusionpbx/default.nix => fusionpbx.nix} (100%) rename config/services/{glauth/default.nix => glauth.nix} (100%) rename config/services/{jellyfin/default.nix => jellyfin.nix} (100%) rename config/services/{katsplash/default.nix => katsplash.nix} (100%) rename config/services/{kattv-ingest/default.nix => kattv-ingest.nix} (100%) rename config/services/{kattv/default.nix => kattv.nix} (100%) rename config/services/{keycloak/default.nix => keycloak.nix} (100%) rename config/services/{logrotate/default.nix => logrotate.nix} (100%) rename config/services/{roundcube/default.nix => mail/roundcube.nix} (100%) rename config/services/{murmur/default.nix => murmur.nix} (100%) rename config/services/{nfs/default.nix => nfs.nix} (100%) rename config/services/{nginx/default.nix => nginx.nix} (100%) rename config/services/{nixos-mailserver/default.nix => nixos-mailserver.nix.old} (100%) rename config/services/{postgres/default.nix => postgres.nix} (100%) rename config/services/{prosody/default.nix => prosody.nix} (100%) delete mode 100644 config/services/radicale/default.nix rename config/services/{restic/default.nix => restic.nix} (100%) rename config/services/{matrix/default.nix => synapse.nix} (100%) rename config/services/{syncplay/default.nix => syncplay.nix} (100%) rename config/services/{taskserver/default.nix => taskserver.nix} (100%) rename config/services/{transmission/default.nix => transmission.nix} (100%) rename config/services/{tvheadend/default.nix => tvheadend.nix} (100%) rename config/services/{vaultwarden/default.nix => vaultwarden.nix} (100%) rename config/services/{vikunja/default.nix => vikunja.nix} (100%) rename config/services/{website/default.nix => website.nix} (100%) rename config/services/{weechat/default.nix => weechat.nix} (100%) rename config/services/{zfs/default.nix => zfs.nix} (100%) rename config/services/{znc/default.nix => znc.nix} (100%) diff --git a/config/hosts/daiyousei.nix b/config/hosts/daiyousei.nix index 7aba4ad4..b17494c3 100644 --- a/config/hosts/daiyousei.nix +++ b/config/hosts/daiyousei.nix @@ -4,10 +4,10 @@ profiles.hardware.oracle.ubuntu profiles.network services.nginx + services.filehost services.keycloak services.vikunja services.tt-rss - services.roundcube services.openldap services.mail services.hedgedoc diff --git a/config/hosts/kyouko.nix b/config/hosts/kyouko.nix index 0deaee7e..6c12e9e3 100644 --- a/config/hosts/kyouko.nix +++ b/config/hosts/kyouko.nix @@ -10,16 +10,13 @@ with lib; profiles.network users.kat.server users.kat.services.weechat - services.filehost services.gitea services.logrotate -# services.nixos-mailserver - services.matrix + services.synapse services.murmur services.nginx services.postgres services.prosody -# services.radicale services.restic services.syncplay services.taskserver diff --git a/config/services/dht22-exporter/default.nix b/config/services/dht22-exporter.nix similarity index 100% rename from config/services/dht22-exporter/default.nix rename to config/services/dht22-exporter.nix diff --git a/config/services/dnscrypt-proxy/default.nix b/config/services/dnscrypt-proxy.nix similarity index 100% rename from config/services/dnscrypt-proxy/default.nix rename to config/services/dnscrypt-proxy.nix diff --git a/config/services/filehost/default.nix b/config/services/filehost/default.nix deleted file mode 100644 index 48272777..00000000 --- a/config/services/filehost/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - services.nginx.virtualHosts = { - "files.${config.network.dns.domain}" = { - root = "/var/www/files"; - enableACME = true; - forceSSL = true; - }; - }; - - deploy.tf.dns.records.services_filehost = { - inherit (config.network.dns) zone; - domain = "files"; - cname = { inherit (config.network.addresses.public) target; }; - }; -} diff --git a/config/services/fusionpbx/default.nix b/config/services/fusionpbx.nix similarity index 100% rename from config/services/fusionpbx/default.nix rename to config/services/fusionpbx.nix diff --git a/config/services/glauth/default.nix b/config/services/glauth.nix similarity index 100% rename from config/services/glauth/default.nix rename to config/services/glauth.nix diff --git a/config/services/jellyfin/default.nix b/config/services/jellyfin.nix similarity index 100% rename from config/services/jellyfin/default.nix rename to config/services/jellyfin.nix diff --git a/config/services/katsplash/default.nix b/config/services/katsplash.nix similarity index 100% rename from config/services/katsplash/default.nix rename to config/services/katsplash.nix diff --git a/config/services/kattv-ingest/default.nix b/config/services/kattv-ingest.nix similarity index 100% rename from config/services/kattv-ingest/default.nix rename to config/services/kattv-ingest.nix diff --git a/config/services/kattv/default.nix b/config/services/kattv.nix similarity index 100% rename from config/services/kattv/default.nix rename to config/services/kattv.nix diff --git a/config/services/keycloak/default.nix b/config/services/keycloak.nix similarity index 100% rename from config/services/keycloak/default.nix rename to config/services/keycloak.nix diff --git a/config/services/logrotate/default.nix b/config/services/logrotate.nix similarity index 100% rename from config/services/logrotate/default.nix rename to config/services/logrotate.nix diff --git a/config/services/mail/default.nix b/config/services/mail/default.nix index f0498d43..c6ea2ed7 100644 --- a/config/services/mail/default.nix +++ b/config/services/mail/default.nix @@ -6,5 +6,6 @@ ./dovecot.nix ./opendkim.nix ./autoconfig.nix + ./roundcube.nix ]; } diff --git a/config/services/roundcube/default.nix b/config/services/mail/roundcube.nix similarity index 100% rename from config/services/roundcube/default.nix rename to config/services/mail/roundcube.nix diff --git a/config/services/murmur/default.nix b/config/services/murmur.nix similarity index 100% rename from config/services/murmur/default.nix rename to config/services/murmur.nix diff --git a/config/services/nfs/default.nix b/config/services/nfs.nix similarity index 100% rename from config/services/nfs/default.nix rename to config/services/nfs.nix diff --git a/config/services/nginx/default.nix b/config/services/nginx.nix similarity index 100% rename from config/services/nginx/default.nix rename to config/services/nginx.nix diff --git a/config/services/nixos-mailserver/default.nix b/config/services/nixos-mailserver.nix.old similarity index 100% rename from config/services/nixos-mailserver/default.nix rename to config/services/nixos-mailserver.nix.old diff --git a/config/services/postgres/default.nix b/config/services/postgres.nix similarity index 100% rename from config/services/postgres/default.nix rename to config/services/postgres.nix diff --git a/config/services/prosody/default.nix b/config/services/prosody.nix similarity index 100% rename from config/services/prosody/default.nix rename to config/services/prosody.nix diff --git a/config/services/radicale/default.nix b/config/services/radicale/default.nix deleted file mode 100644 index 7d6ee836..00000000 --- a/config/services/radicale/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, pkgs, lib, tf, ... }: - -with lib; - -{ - secrets.files.radicale_htpasswd = { - text = '' - kat@kittywit.ch:${tf.variables.mail-kat-hash.ref} - ''; - }; - - services.radicale = { - enable = true; - settings = { - auth = { - type = "htpasswd"; - htpasswd_filename = config.secrets.files.radicale_htpasswd.path; - htpasswd_encryption = "bcrypt"; - }; - }; - }; - - services.nginx.virtualHosts = { - "cal.${config.network.dns.domain}" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:5232/"; - extraConfig = '' - proxy_set_header X-Script-Name /; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Authorization; - ''; - }; - }; - }; - - deploy.tf.dns.records.services_radicale = { - inherit (config.network.dns) zone; - domain = "cal"; - cname = { inherit (config.network.addresses.public) target; }; - }; -} diff --git a/config/services/restic/default.nix b/config/services/restic.nix similarity index 100% rename from config/services/restic/default.nix rename to config/services/restic.nix diff --git a/config/services/matrix/default.nix b/config/services/synapse.nix similarity index 100% rename from config/services/matrix/default.nix rename to config/services/synapse.nix diff --git a/config/services/syncplay/default.nix b/config/services/syncplay.nix similarity index 100% rename from config/services/syncplay/default.nix rename to config/services/syncplay.nix diff --git a/config/services/taskserver/default.nix b/config/services/taskserver.nix similarity index 100% rename from config/services/taskserver/default.nix rename to config/services/taskserver.nix diff --git a/config/services/transmission/default.nix b/config/services/transmission.nix similarity index 100% rename from config/services/transmission/default.nix rename to config/services/transmission.nix diff --git a/config/services/tvheadend/default.nix b/config/services/tvheadend.nix similarity index 100% rename from config/services/tvheadend/default.nix rename to config/services/tvheadend.nix diff --git a/config/services/vaultwarden/default.nix b/config/services/vaultwarden.nix similarity index 100% rename from config/services/vaultwarden/default.nix rename to config/services/vaultwarden.nix diff --git a/config/services/vikunja/default.nix b/config/services/vikunja.nix similarity index 100% rename from config/services/vikunja/default.nix rename to config/services/vikunja.nix diff --git a/config/services/website/default.nix b/config/services/website.nix similarity index 100% rename from config/services/website/default.nix rename to config/services/website.nix diff --git a/config/services/weechat/default.nix b/config/services/weechat.nix similarity index 100% rename from config/services/weechat/default.nix rename to config/services/weechat.nix diff --git a/config/services/zfs/default.nix b/config/services/zfs.nix similarity index 100% rename from config/services/zfs/default.nix rename to config/services/zfs.nix diff --git a/config/services/znc/default.nix b/config/services/znc.nix similarity index 100% rename from config/services/znc/default.nix rename to config/services/znc.nix