software/nextcloud:simplify nextcloud

software/nextcloud/apache-httpd.conf.in

-
-
-<VirtualHost *:{{ parameter_dict['port'] }}>
-  ServerAdmin admin@example.com
-  DocumentRoot {{ parameter_dict['document-root'] }}
-
-  SetEnvIf Origin "^http(s)?://(.+\.)?(app\.officejs\.com)$" ORIGIN_DOMAIN=$0
-  Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
-  Header always set Access-Control-Allow-Credentials "true" env=ORIGIN_DOMAIN
-  Header always set Access-Control-Allow-Methods "PROPFIND, PROPPATCH, COPY, MOVE, DELETE, MKCOL, LOCK, UNLOCK, PUT, GETLIB, VERSION-CONTROL, CHECKIN, CHECKOUT, UNCHECKOUT, REPORT, UPDATE, CANCELUPLOAD, HEAD, OPTIONS, GET, POST" env=ORIGIN_DOMAIN
-  Header always set Access-Control-Allow-Headers "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization" env=ORIGIN_DOMAIN
-
-
-  <IfModule mod_headers.c>
-   Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains"
-  </IfModule>
-
-  <Directory {{ parameter_dict['document-root'] }}>
-      Options +FollowSymlinks
-      AllowOverride All
-      Require all granted
-      SetEnv HOME {{ parameter_dict['document-root'] }}
-      SetEnv HTTP_HOME {{ parameter_dict['document-root'] }}
-      <IfModule mod_dav.c>
-        Dav off
-      </IfModule>
-  </Directory>
-  ErrorLog "{{ parameter_dict['log-dir'] }}/nextcloud-error.log"
-  CustomLog "{{ parameter_dict['log-dir'] }}/nextcloud-access.log" combined
-
-</VirtualHost>

software/nextcloud/buildout.hash.cfg

@@ -16,14 +16,10 @@
 filename = nextcloud-install.sh.in
 md5sum = 094c26b177fdde69b41d81b89bab542b
 
-[template-apache-httpd]
-filename = apache-httpd.conf.in
-md5sum = f7e8f6ea20f8685bb4e42cacaee4116f
-
 [template-nextcloud-config.json]
 filename = nextcloud-config.json.in
 md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
 
 [template-nextcloud-instance]
 filename = nextcloud-instance.cfg.in
-md5sum = 4426b5e62c61efec2e68e7f548bc6463
+md5sum = e144dc4cdc3bd0a9be81ac0cc2cfdbd4

software/nextcloud/nextcloud-instance.cfg.in

@@ -55,17 +55,6 @@ cli-url = ${slap-parameter:instance.cli-url}
 data-dir = ${nc-directory:data}
 redis-socket = ${service-redis:unixsocket}
 
-#php.ini parameters
-php.memory_limit = 512M
-php.date.timezone = Europe/Paris
-php.upload_max_filesize = 10240M
-php.post_max_size = 10240M
-php.session.cookie_secure = True
-php.max_execution_time = 1800
-php.max_input_time = 3600
-php.output_buffering = 'Off'
-php.max_file_uploads = 100
-
 #SMTP settings
 mail.from = ${slap-parameter:instance.mail-from}
 mail.domain = ${slap-parameter:instance.mail-domain}
@@ -93,7 +82,6 @@ depends =
   ${redis-promise:recipe}
   ${nextcloud-cron:recipe}
   ${nextcloud-optimize:recipe}
-  ${nextcloud-apache-httpd:recipe}
   ${nextcloud-backup-cron:recipe}
   ${nextcloud-news-updater:recipe}
   ${nextcloud-config-update:recipe}
@@ -120,13 +108,6 @@ input = inline:#!/bin/bash
 output = ${directory:bin}/check-nc-install
 mode = 744
 
-[nextcloud-apache-httpd]
-recipe = slapos.recipe.template:jinja2
-url = {{ nextcloud_apache_httpd }}
-output = ${directory:apache.d}/nextcloud.conf
-context =
-  section parameter_dict apache-php-configuration
-
 [nextcloud-cron]
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
@@ -199,11 +180,6 @@ input = inline:#!/bin/sh
   ${php-bin:wrapper-path} ${instance-parameter:nextcloud}/occ config:import ${nextcloud-config.json:output}
 mode = 744
 
-[php-bin]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:bin}/php
-command-line = ${instance-parameter:php-bin} -c ${php.ini-conf:output}
-
 [publish-connection-information]
 admin-user = ${instance-parameter:admin-user}
 admin-password = ${instance-parameter:admin-password}

software/nextcloud/software.cfg

@@ -15,9 +15,6 @@ md5sum = d81902d2dec5d547779bec6336a438be
 [template-nextcloud-install.sh]
 <= nc-download
 
-[template-apache-httpd]
-<= nc-download
-
 [template-nextcloud-config.json]
 <= nc-download
 
@@ -34,7 +31,6 @@ context =
           raw redis_bin              ${redis:location}/bin/redis-server
           raw redis_cli              ${redis:location}/bin/redis-cli
           key nextcloud_install_sh   template-nextcloud-install.sh:target
-          key nextcloud_apache_httpd template-apache-httpd:target
           key nextcloud_parameter_json template-nextcloud-config.json:target
           section nextcloud_apps     nextcloud-apps