nextcloud: set custom logs for apache and nextcloud

Fix nextcloud backup cron frequency
Fix apache graceful script path

software/nextcloud/apache-httpd.conf.in

@@ -25,4 +25,7 @@
         Dav off
       </IfModule>
   </Directory>
+  ErrorLog "{{ parameter_dict['log-dir'] }}/nextcloud-error.log"
+  CustomLog "{{ parameter_dict['log-dir'] }}/nextcloud-access.log" combined
+
 </VirtualHost>
\ No newline at end of file

software/nextcloud/nextcloud-instance.cfg.in

@@ -131,7 +131,7 @@ mode = 744
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = nextcloud-backup
-frequency = 0 0 * * * *
+frequency = 0 0 * * *
 command = ${nextcloud-backup:output}
 
 [nextcloud-optimize]

software/nextcloud/software.cfg

@@ -24,7 +24,7 @@ md5sum = a2281f86f6a26a8ff40a57a495505977
 [template-apache-httpd]
 <= nc-download-base
 filename = apache-httpd.conf.in
-md5sum = f3bca64bf991526fd8221035a86aacbf
+md5sum = 839258624e273aac71a96516bf34c7e6
 
 [template-nextcloud-config.json]
 <= nc-download-base
@@ -36,7 +36,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/nextcloud-instance.cfg.in
 rendered = ${buildout:directory}/instance-nextcloud.cfg
 extensions = jinja2.ext.do
-md5sum = 5c721c7eb8a06147b849a65ba92becba
+md5sum = 59e9c65e655cf9cf144d97dd36863ede
 context = 
           key gzip_location          gzip:location
           key python3_location       python3.6.6:location

stack/lamp/buildout.cfg

@@ -119,7 +119,7 @@ context =
 <= template-download-base
 filename = instance-apache-php.cfg.in
 output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
-md5sum = 7edcbca22e800f2c90559298c44d5a48
+md5sum = 44796786448fd0319dde14923fbd798b
 
 [instance-lamp]
 <= template-download-base

stack/lamp/instance-apache-php.cfg.in

@@ -129,6 +129,7 @@ port = ${apache-network-configuration:listening-port}
 url = https://[${:ip}]:${:port}/
 error-log = ${directory:httpd-log}/error.log
 access-log = ${directory:httpd-log}/access.log
+log-dir = ${directory:httpd-log}
 php-ini-dir = ${directory:php-ini-dir}
 cert-file = ${ca-directory:certs}/httpd.crt
 key-file = ${ca-directory:certs}/httpd.key
@@ -153,7 +154,7 @@ wait-for-files =
 
 [apache-graceful]
 recipe = collective.recipe.template
-output = ${directory:bin}/apache-httpd-graceful
+output = ${directory:scripts}/apache-httpd-graceful
 mode = 700
 input = inline:
   #!/bin/sh
@@ -162,7 +163,7 @@ input = inline:
 [logrotate-entry-apache]
 <= logrotate-entry-base
 name = apache
-log = ${apache-php-configuration:error-log} ${apache-php-configuration:access-log}
+log = ${apache-php-configuration:log-dir}/*.log
 frequency = daily
 rotate-num = 30