templates/application/config.php.erb

@@ -24,7 +24,6 @@ $CONFIG = array (
   'config_is_read_only' => true,
   'csrf.disabled' => true,
   'datadirectory' => '/var/www/html/data',
-  'davstorage.request_timeout' => 86401,
   'dbhost' => '<%= @dbhost %>',
   'dbname' => '<%= @dbname %>',
   'dbpassword' => '<%= @mysql_user_password %>',
@@ -39,7 +38,6 @@ $CONFIG = array (
 <% if @location == 'sunet-test' -%>
   'filelocking.debug' => true,
 <% end -%>
-  'files_external_allow_create_new_local' => false,
   'forcessl' => true,
   'gs.enabled' => '<%= @gs_enabled %>',
   'gs.federation' => '<%= @gs_federation %>',

templates/application/occ.erb

@@ -15,19 +15,18 @@ if [[ "x${oc_list}" != "x" ]]; then
         done
 fi
 
-if [[ ${1} == 'config:editable' ]]; then
-  echo "config:editable is deprecated"
+if [[ ${1} == 'config:editable' ]] && [[ ${2} == '--on' ]]; then
+  docker exec -ti ${MY_VARS} -u www-data ${container} sh -c 'sed "s/config_is_read_only\(.\) => true,/config_is_read_only\1 => false,/" /var/www/html/config/config.php > /var/www/html/config/config.php.tmp'
+  docker exec -ti ${MY_VARS} -u www-data ${container} cp /var/www/html/config/config.php.tmp  /var/www/html/config/config.php
+  docker exec -ti ${MY_VARS} -u www-data ${container} rm /var/www/html/config/config.php.tmp
   exit 0
 fi
-docker exec ${container} chmod u+w /var/www/html/config/
-docker exec -ti ${MY_VARS} -u www-data ${container} sh -c 'sed "s/config_is_read_only\(.\) => true,/config_is_read_only\1 => false,/" /var/www/html/config/config.php > /var/www/html/config/config.php.tmp'
-docker exec -ti ${MY_VARS} -u www-data ${container} cp /var/www/html/config/config.php.tmp  /var/www/html/config/config.php
-docker exec -ti ${MY_VARS} -u www-data ${container} rm /var/www/html/config/config.php.tmp
+if [[ ${1} == 'config:editable' ]] && [[ ${2} == '--off' ]]; then
+  docker exec -ti ${MY_VARS} -u www-data ${container} sh -c 'sed "s/config_is_read_only\(.\) => false,/config_is_read_only\1 => true,/" /var/www/html/config/config.php > /var/www/html/config/config.php.tmp'
+  docker exec -ti ${MY_VARS} -u www-data ${container} cp /var/www/html/config/config.php.tmp  /var/www/html/config/config.php
+  docker exec -ti ${MY_VARS} -u www-data ${container} rm /var/www/html/config/config.php.tmp
+  exit 0
+fi
+
 docker exec -ti ${MY_VARS} -u www-data ${container} php --define apc.enable_cli=1 /var/www/html/occ "$@"
-docker exec -ti ${MY_VARS} -u www-data ${container} sh -c 'sed "s/config_is_read_only\(.\) => false,/config_is_read_only\1 => true,/" /var/www/html/config/config.php > /var/www/html/config/config.php.tmp'
-docker exec -ti ${MY_VARS} -u www-data ${container} cp /var/www/html/config/config.php.tmp  /var/www/html/config/config.php
-docker exec -ti ${MY_VARS} -u www-data ${container} rm /var/www/html/config/config.php.tmp
-docker exec ${container} chmod u-w /var/www/html/config/
-exit 0
-