diff --git a/.re-commit-config.yaml b/.re-commit-config.yaml deleted file mode 120000 index b19354f..0000000 --- a/.re-commit-config.yaml +++ /dev/null @@ -1 +0,0 @@ -/nix/store/0nibh6zrkxhh7qc1q6kkq5810iqd0059-pre-commit-config.json \ No newline at end of file diff --git a/viola/services/postgresql.nix b/viola/services/postgresql.nix index 6dda386..62c57bb 100644 --- a/viola/services/postgresql.nix +++ b/viola/services/postgresql.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { services = { postgresql = { enable = true; @@ -45,11 +45,11 @@ ]; initialScript = ""; # nope - + authentication = ""; #nope settings = { - port = ${dbport}; + port = "${dbport}"; }; }; }; diff --git a/viola/services/redis.nix b/viola/services/redis.nix index 976a98a..75fdfed 100644 --- a/viola/services/redis.nix +++ b/viola/services/redis.nix @@ -5,11 +5,11 @@ servers = { "forgejo" = { enable = true; - port = ${cacheport1}; + port = "${cacheport1}"; logLevel = "warning"; databases = 16; maxclients = 10000; - requirePass = ${cachepass1}; + requirePass = "${cachepass1}"; settings = { stop-writes-on-bgsave-error = "yes"; @@ -41,11 +41,11 @@ "woodpecker" = { enable = false; - port = ${cacheport2}; + port = "${cacheport2}"; logLevel = "warning"; databases = 16; maxclients = 10000; - requirePass = ${cachepass2}; + requirePass = "${cachepass2}"; settings = { stop-writes-on-bgsave-error = "yes"; @@ -77,11 +77,11 @@ "stalwart" = { enable = true; - port = ${cacheport3}; + port = "${cacheport3}"; logLevel = "warning"; databases = 16; maxclients = 10000; - requirePass = ${cachepass3}; + requirePass = "${cachepass3}"; settings = { stop-writes-on-bgsave-error = "yes"; @@ -113,11 +113,11 @@ "zitadel" = { enable = true; - port = ${cacheport4}; + port = "${cacheport4}"; logLevel = "warning"; databases = 16; maxclients = 10000; - requirePass = ${cachepass4}; + requirePass = "${cachepass4}"; settings = { stop-writes-on-bgsave-error = "yes"; diff --git a/viola/services/stalwart.nix b/viola/services/stalwart.nix index 37e5f91..9523498 100644 --- a/viola/services/stalwart.nix +++ b/viola/services/stalwart.nix @@ -9,7 +9,7 @@ _: { challenge = "dns-01"; provider = "cloudflare"; origin = "hand7s.org"; - secret = ${mail_secret}; + secret = "${mail_secret}"; contact = [ "me@hand7s.org" ]; diff --git a/viola/services/woodpecker.nix b/viola/services/woodpecker.nix index c9a69e0..c3fe436 100644 --- a/viola/services/woodpecker.nix +++ b/viola/services/woodpecker.nix @@ -5,15 +5,15 @@ _: { environment = { WOODPECKER_OPEN = "true"; WOODPECKER_DATABASE_DRIVER = "postgres"; - WOODPECKER_DATABASE_DATASOURCE = ${pqsql_socket}; - WOODPECKER_SERVER_ADDR = ${ciport1}; - WOODPECKER_GRPC_ADDR = ${ciport1}; + WOODPECKER_DATABASE_DATASOURCE = "${pqsql_socket}"; + WOODPECKER_SERVER_ADDR = "${ciport1}"; + WOODPECKER_GRPC_ADDR = "${ciport1}"; WOODPECKER_HOST = "https://cicd.hand7s.org"; WOODPECKER_FORGEJO = "true"; WOODPECKER_FORGEJO_URL = "https://git.hand7s.org"; - WOODPECKER_FORGEJO_CLIENT = ${cisecret1}; - FORGEJO_SECRET = ${cisecret2}; + WOODPECKER_FORGEJO_CLIENT = "${cisecret1}"; + FORGEJO_SECRET = "${cisecret2}"; }; }; };