Move nextcloud configuration to var dir

Fixes https://git.immae.eu/mantisbt/view.php?id=96

diff --git a/nixops/modules/websites/tools/cloud/default.nix b/nixops/modules/websites/tools/cloud/default.nix
index 241b98251debab4c09b6d6ad9d34bb21c908a3cd..0c6d13d376196f863fac11e4457bbf7c04e61d49 100644 (file)
--- a/nixops/modules/websites/tools/cloud/default.nix
+++ b/nixops/modules/websites/tools/cloud/default.nix
@@ -30,7 +30,7 @@ in {
         cd ${nextcloud.webRoot}
         NEXTCLOUD_CONFIG_DIR="${nextcloud.webRoot}/config" \
           exec \
-          ${pkgs.php}/bin/php \
+          sudo -u wwwrun ${pkgs.php}/bin/php \
           -c ${pkgs.php}/etc/php.ini \
           occ $*
         '';

diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix
index 1e770b8b5b7c8a5efe2aa98bf9cfc92950f770e2..0185b0f0c29f843e3b42e80d2d7fadb9a65c05d2 100644 (file)
--- a/nixops/modules/websites/tools/cloud/nextcloud.nix
+++ b/nixops/modules/websites/tools/cloud/nextcloud.nix
@@ -146,7 +146,6 @@ let
         'overwrite.cli.url' => 'https://cloud.immae.eu',
         'ldapIgnoreNamingRules' => false,
         'ldapProviderFactory' => '\\OCA\\User_LDAP\\LDAPProviderFactory',
-        'config_is_read_only' => true,
       );
       '';
     config = stdenv.mkDerivation rec {
@@ -172,7 +171,7 @@ let
         mkdir -p $out/
         cp -R . $out/
         rm -r $out/config
-        ln -sf ${config} $out/config
+        ln -sf ../../../../../${varDir}/config $out/config
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/apps/${name}") apps
         )}
@@ -191,6 +190,11 @@ let
       text = ''
         install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir}
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
+        if [ ! -e ${varDir}/config ]; then
+          cp -a ${config} ${varDir}/config
+          chown -R ${apache.user}:${apache.group} ${varDir}/config
+          chmod -R u+w ${varDir}/config
+        fi
       '';
     };
     apache = {