diff --git a/.sops.yaml b/.sops.yaml index b1df9f5..e01f634 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -49,7 +49,7 @@ creation_rules: - *ldap-server-test - *testmodules - *netboot - - path_regex: utils/modules/bitwarden/[^/]+\.yaml$ + - path_regex: hosts/web-01.cloonar.com/modules/bitwarden/[^/]+\.yaml$ key_groups: - age: - *dominik @@ -59,7 +59,7 @@ creation_rules: - age: - *dominik - *git-server - - path_regex: utils/modules/zammad/[^/]+\.yaml$ + - path_regex: hosts/web-01.cloonar.com/modules/zammad/[^/]+\.yaml$ key_groups: - age: - *dominik @@ -80,12 +80,12 @@ creation_rules: - age: - *dominik - *home-assistant-server - - path_regex: utils/modules/authelia/[^/]+\.yaml$ + - path_regex: hosts/web-01.cloonar.com/modules/authelia/[^/]+\.yaml$ key_groups: - age: - *dominik - *web-01-server - - path_regex: utils/modules/nextcloud/[^/]+\.yaml$ + - path_regex: hosts/web-01.cloonar.com/modules/nextcloud/[^/]+\.yaml$ key_groups: - age: - *dominik diff --git a/hosts/git.cloonar.com/configuration.nix b/hosts/git.cloonar.com/configuration.nix index 7f01c8d..21410e4 100644 --- a/hosts/git.cloonar.com/configuration.nix +++ b/hosts/git.cloonar.com/configuration.nix @@ -9,7 +9,6 @@ ./utils/modules/drone/runner.nix ./utils/modules/borgbackup.nix ./utils/modules/netdata.nix - ./utils/modules/tang.nix ./utils/modules/promtail ./utils/modules/victoriametrics diff --git a/hosts/web-01.cloonar.com/configuration.nix b/hosts/web-01.cloonar.com/configuration.nix index fe7dca4..8ab4656 100644 --- a/hosts/web-01.cloonar.com/configuration.nix +++ b/hosts/web-01.cloonar.com/configuration.nix @@ -1,28 +1,29 @@ { ... }: { imports = [ ./utils/bento.nix - ./utils/modules/sops.nix ./utils/modules/lego/lego.nix - ./utils/modules/mysql.nix + + ./modules/mysql.nix ./utils/modules/nginx.nix - ./utils/modules/bitwarden/default.nix - ./utils/modules/zammad/default.nix - ./utils/modules/authelia/default.nix - ./utils/modules/autoupgrade.nix - ./utils/modules/nextcloud + ./modules/bitwarden + ./modules/zammad + ./modules/authelia + ./modules/nextcloud ./modules/postgresql.nix ./modules/grafana.nix ./modules/loki.nix ./modules/victoriametrics.nix - ./utils/modules/promtail + ./utils/modules/autoupgrade.nix + ./utils/modules/promtail ./utils/modules/borgbackup.nix ./utils/modules/netdata.nix + ./hardware-configuration.nix - ./utils/modules/services/web/typo3.nix - ./utils/modules/services/web/stack.nix + ./modules/web/typo3.nix + ./modules/web/stack.nix ./sites/autoconfig.cloonar.com.nix diff --git a/utils/modules/authelia/default.nix b/hosts/web-01.cloonar.com/modules/authelia/default.nix similarity index 100% rename from utils/modules/authelia/default.nix rename to hosts/web-01.cloonar.com/modules/authelia/default.nix diff --git a/utils/modules/authelia/secrets.yaml b/hosts/web-01.cloonar.com/modules/authelia/secrets.yaml similarity index 100% rename from utils/modules/authelia/secrets.yaml rename to hosts/web-01.cloonar.com/modules/authelia/secrets.yaml diff --git a/utils/modules/bitwarden/default.nix b/hosts/web-01.cloonar.com/modules/bitwarden/default.nix similarity index 87% rename from utils/modules/bitwarden/default.nix rename to hosts/web-01.cloonar.com/modules/bitwarden/default.nix index 782dc29..059f58c 100644 --- a/utils/modules/bitwarden/default.nix +++ b/hosts/web-01.cloonar.com/modules/bitwarden/default.nix @@ -97,22 +97,10 @@ in { }; sops.secrets = { - bitwarden-admin-token = { - owner = "vaultwarden_ldap"; - sopsFile = ./secrets.yaml; - }; - bitwarden-ldap-password = { - owner = "vaultwarden_ldap"; - sopsFile = ./secrets.yaml; - }; - bitwarden-db-password = { - owner = "vaultwarden"; - sopsFile = ./secrets.yaml; - }; - bitwarden-smtp-password = { - owner = "vaultwarden"; - sopsFile = ./secrets.yaml; - }; + bitwarden-admin-token.owner = "vaultwarden_ldap"; + bitwarden-ldap-password.owner = "vaultwarden_ldap"; + bitwarden-db-password.owner = "vaultwarden"; + bitwarden-smtp-password.owner = "vaultwarden"; }; users.users.vaultwarden_ldap = { diff --git a/utils/modules/bitwarden/secrets.yaml b/hosts/web-01.cloonar.com/modules/bitwarden/secrets.yaml similarity index 100% rename from utils/modules/bitwarden/secrets.yaml rename to hosts/web-01.cloonar.com/modules/bitwarden/secrets.yaml diff --git a/hosts/web-01.cloonar.com/modules/mysql.nix b/hosts/web-01.cloonar.com/modules/mysql.nix new file mode 100644 index 0000000..84578ea --- /dev/null +++ b/hosts/web-01.cloonar.com/modules/mysql.nix @@ -0,0 +1,78 @@ +{ pkgs, ... }: + +let + mysqlCreateDatabase = pkgs.writeShellScriptBin "mysql-create-database" '' + #!/usr/bin/env bash + if [ $# -lt 2 ] + then + echo "Usage: $0 " + exit 1 + fi + + if ! [ $EUID -eq 0 ] + then + echo "Must be root!" >&2 + exit 1 + fi + + DB="$1" + HOST="$2" + PASSWORD="$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64 | xargs)" + + cat <" + exit 1 + fi + + if ! [ $EUID -eq 0 ] + then + echo "Must be root!" >&2 + exit 1 + fi + + DB="$1" + PASSWORD="$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64 | xargs)" + + cat <