Skip to content
Snippets Groups Projects
Verified Commit aabbbaeb authored by David Beniamine's avatar David Beniamine
Browse files

Merge branch 'master' of...

parents 7e04243a 3e5809a7
Branches
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ apt-get update && apt-get install certbot ...@@ -24,7 +24,7 @@ apt-get update && apt-get install certbot
DOMAINS="dolibarr.${DOMAIN},nextcloud.${DOMAIN},tetras-back.${DOMAIN}" DOMAINS="dolibarr.${DOMAIN},nextcloud.${DOMAIN},tetras-back.${DOMAIN}"
ARGS="--hsts --must-staple --email=${SERVER_ADMIN} --domains=${DOMAINS} ARGS="--hsts --must-staple --email=${SERVER_ADMIN} --domains=${DOMAINS}
--text --agree-tos" --text --agree-tos"
line="0 1 `date +%d` */2 * /usr/bin/certbot renew --force-renewal" line="0 1 * * `date +%u` /usr/bin/certbot renew --force-renewal"
if [ "${WEB_SERVER}" == "apache2" ] if [ "${WEB_SERVER}" == "apache2" ]
then then
additional_packages="python-certbot-apache" additional_packages="python-certbot-apache"
......
...@@ -13,7 +13,9 @@ echo -n "'trusted_domains' =>" ...@@ -13,7 +13,9 @@ echo -n "'trusted_domains' =>"
echo -n "array(" echo -n "array("
echo -n "0 => 'localhost'," echo -n "0 => 'localhost',"
echo -n "1 => 'nextcloud.$DOMAIN'," echo -n "1 => 'nextcloud.$DOMAIN',"
echo -n "),")" echo -n "),"
echo -n "'updater.release.channel' => 'production',"
echo -n "'default_language' => 'fr',")"
# Installer configuration nextcloud's OCC tools # Installer configuration nextcloud's OCC tools
NEXTCLOUD_DATABASE="mysql" NEXTCLOUD_DATABASE="mysql"
......
...@@ -331,7 +331,6 @@ sed -i.bak -e "/'trusted_domains'/,/),/d; ...@@ -331,7 +331,6 @@ sed -i.bak -e "/'trusted_domains'/,/),/d;
s@)@${sections})@; s@)@${sections})@;
/array(/s@,@,\n@g;" \ /array(/s@,@,\n@g;" \
-e 's/APCu/OC\\\\Memcache\\\\APCu/' \ -e 's/APCu/OC\\\\Memcache\\\\APCu/' \
-e "s/^);$/ 'updater.release.channel' => 'production',\n);/" \
`pwd`/config.php `pwd`/config.php
echo "sed -i.bak \"/'trusted_domains'/,/),/d;" \ echo "sed -i.bak \"/'trusted_domains'/,/),/d;" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment