summary refs log tree commit diff
path: root/nixos/modules/services/web-servers
diff options
context:
space:
mode:
authorOkina Matara <okinan@chiru.no>2018-06-09 22:49:27 -0500
committerOkina Matara <okinan@chiru.no>2018-06-29 15:56:33 -0500
commit4b91c2428b6547d98f44abe395f997209ebd5a00 (patch)
treeeae9ccb3e75d5f5abd00a78124d7efe17b49f2b8 /nixos/modules/services/web-servers
parent05474564b29e8fea5acff814dd841359e537fcba (diff)
downloadnixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.tar
nixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.gz
nixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.bz2
nixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.lz
nixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.xz
nixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.zst
nixlib-4b91c2428b6547d98f44abe395f997209ebd5a00.zip
meguca: 2018-05-26 -> 2018-06-10
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r--nixos/modules/services/web-servers/meguca.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix
index 8ae86c67a29f..7aaa820c15c1 100644
--- a/nixos/modules/services/web-servers/meguca.nix
+++ b/nixos/modules/services/web-servers/meguca.nix
@@ -104,15 +104,16 @@ in
       preStart = ''
         # Ensure folder exists and links are correct or create them
         mkdir -p ${cfg.baseDir}
+        chmod 750 ${cfg.baseDir}
         ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir}
 
         # Ensure the database is correct or create it
         ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
           -SDR meguca || true
-        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql \
-          -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true
         ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
           -T template0 -E UTF8 -O meguca meguca || true
+        ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \
+          -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true
       '';
 
     script = ''