diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-13 02:26:54 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-16 01:39:24 +0200 |
commit | da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2 (patch) | |
tree | bd45012713b065829c1991e55d52081a8baef58a /modules/private/websites/tools/tools/wallabag.nix | |
parent | bd5c5d4e23ebd3863a960976767ed4a83dfd07fe (diff) | |
download | Nix-da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2.tar.gz Nix-da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2.tar.zst Nix-da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2.zip |
Move secrets to flakes
Diffstat (limited to 'modules/private/websites/tools/tools/wallabag.nix')
-rw-r--r-- | modules/private/websites/tools/tools/wallabag.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix index 1cb0645..1a604c7 100644 --- a/modules/private/websites/tools/tools/wallabag.nix +++ b/modules/private/websites/tools/tools/wallabag.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { env, wallabag, mylibs }: | 1 | { env, wallabag, mylibs, config }: |
2 | rec { | 2 | rec { |
3 | backups = { | 3 | backups = { |
4 | rootDir = varDir; | 4 | rootDir = varDir; |
@@ -69,7 +69,7 @@ rec { | |||
69 | arguments: ['/run/wrappers/bin/sendmail -bs'] | 69 | arguments: ['/run/wrappers/bin/sendmail -bs'] |
70 | ''; | 70 | ''; |
71 | }]; | 71 | }]; |
72 | webappDir = wallabag.override { ldap = true; wallabag_config = "/var/secrets/webapps/tools-wallabag"; }; | 72 | webappDir = wallabag.override { ldap = true; wallabag_config = config.secrets.fullPaths."webapps/tools-wallabag"; }; |
73 | activationScript = '' | 73 | activationScript = '' |
74 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ | 74 | install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ |
75 | ${varDir}/var ${varDir}/data/db ${varDir}/assets/images | 75 | ${varDir}/var ${varDir}/data/db ${varDir}/assets/images |
@@ -125,11 +125,11 @@ rec { | |||
125 | /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction | 125 | /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction |
126 | popd > /dev/null | 126 | popd > /dev/null |
127 | echo -n "${webappDir}" > ${varDir}/currentWebappDir | 127 | echo -n "${webappDir}" > ${varDir}/currentWebappDir |
128 | sha512sum /var/secrets/webapps/tools-wallabag > ${varDir}/currentKey | 128 | sha512sum ${config.secrets.fullPaths."webapps/tools-wallabag"} > ${varDir}/currentKey |
129 | fi | 129 | fi |
130 | ''; | 130 | ''; |
131 | serviceDeps = [ "postgresql.service" "openldap.service" ]; | 131 | serviceDeps = [ "postgresql.service" "openldap.service" ]; |
132 | basedir = builtins.concatStringsSep ":" [ webappDir "/var/secrets/webapps/tools-wallabag" varDir ]; | 132 | basedir = builtins.concatStringsSep ":" [ webappDir config.secrets.fullPaths."webapps/tools-wallabag" varDir ]; |
133 | pool = { | 133 | pool = { |
134 | "listen.owner" = apache.user; | 134 | "listen.owner" = apache.user; |
135 | "listen.group" = apache.group; | 135 | "listen.group" = apache.group; |