Merge branch 'master' of...

Merge branch 'master' of ssh://gitlab.tetras-libre.fr:2222/tetras-libre/NoCloud-Auto-Installer into github

DOLIBARR_PACKAGES/apply_patch.sh

+#!/bin/bash
+# echo "Fixing Dolibarr bug #7420"
+# sed -i.bak "178s@'\(__[^_]*__\)'@'/\1/'@g"  /usr/share/dolibarr/htdocs/includes/odtphp/Segment.php

etc/apache2/sites-available/tetras-back.conf

@@ -5,7 +5,7 @@
     # Apache config file for Dolibarr
     
     header set X-Clacks-Overhead "GNU Terry Pratchett"
-    header set Content-Security-Policy "default-src 'self'; script-src 'self' https://code.jquery.com;"
+     Header set Content-Security-Policy "default-src 'self' 'unsafe-inline' https://code.jquery.com data:;"
 
     # Fix Poxy vulnerability
     # https://httpoxy.org/#fix-nowEquestHeader unset Proxy early

expandCertbot.sh

+#!/bin/bash
+if [ -z "$2" ]
+then
+	echo "usage $0 additional-dommains certificate"
+	echo "additional-domains : comma separated list of domains"
+	echo "expand the existing certificate with the given domains"
+	exit 1
+fi
+domains="`openssl x509  -in $2 -inform pem -noout -text | grep DNS | sed -e 's/  *//g' -e 's/DNS://g'`,$1"
+
+echo "Requesting certificate for domains: '$domains'"
+certbot certonly --expand --apache --must-staple --hsts --domains=$domains
+

installCertbot.sh

@@ -24,7 +24,7 @@ apt-get update && apt-get install certbot
 DOMAINS="dolibarr.${DOMAIN},nextcloud.${DOMAIN},tetras-back.${DOMAIN}"
 ARGS="--hsts --must-staple --email=${SERVER_ADMIN} --domains=${DOMAINS}
     --text --agree-tos"
-line="0 1 * * `date +%u` /usr/bin/certbot renew --force-renewal"
+line="0 1 * * `date +%u` /usr/bin/certbot renew --force-renewal > /var/log/certbot.log 2>&1"
 if [ "${WEB_SERVER}" == "apache2" ]
 then
     additional_packages="python-certbot-apache"

installDolibarr.sh

@@ -182,4 +182,6 @@ fi
 echo "cd ${SCRIPT_DIRECTORY}"
 cd ${SCRIPT_DIRECTORY}
 
+[ -f "DOLIBARR_PACKAGES/apply_patch.sh" ] && /bin/bash DOLIBARR_PACKAGES/apply_patch.sh
+
 

upgradeDolibarr.sh

@@ -47,5 +47,6 @@ dpkg -i $package
 echo "Fixing dependencies"
 apt-get -f install
 rm /usr/share/dolibarr/documents/install.lock
+[ -f "DOLIBARR_PACKAGES/apply_patch.sh" ] && /bin/bash DOLIBARR_PACKAGES/apply_patch.sh
 echo "One final step is required to upgrade to Dolibarr $last_repo_version:"
 echo "Please go to your Dolibarr page and run the manual upgrade step"