diff --git a/DOLIBARR_PACKAGES/apply_patch.sh b/DOLIBARR_PACKAGES/apply_patch.sh new file mode 100644 index 0000000000000000000000000000000000000000..d189812feea6515a3df8655a4a06dbc03a8f3019 --- /dev/null +++ b/DOLIBARR_PACKAGES/apply_patch.sh @@ -0,0 +1,3 @@ +#!/bin/bash +# echo "Fixing Dolibarr bug #7420" +# sed -i.bak "178s@'\(__[^_]*__\)'@'/\1/'@g" /usr/share/dolibarr/htdocs/includes/odtphp/Segment.php diff --git a/DOLIBARR_PACKAGES/dolibarr_6.0.0-4_all.deb b/DOLIBARR_PACKAGES/dolibarr_6.0.2-4_all.deb similarity index 76% rename from DOLIBARR_PACKAGES/dolibarr_6.0.0-4_all.deb rename to DOLIBARR_PACKAGES/dolibarr_6.0.2-4_all.deb index 13e04f267ce73dbd24789daa0f0fb86cdb49e192..c1153bf258e518ca7a1abe955e1b6bc3039630ec 100644 Binary files a/DOLIBARR_PACKAGES/dolibarr_6.0.0-4_all.deb and b/DOLIBARR_PACKAGES/dolibarr_6.0.2-4_all.deb differ diff --git a/etc/apache2/sites-available/tetras-back.conf b/etc/apache2/sites-available/tetras-back.conf index 491416ac72f267e03474254cc5efcfcfd65d13b1..578bf975e2cb0a573bd12a65011143fbf962ac14 100644 --- a/etc/apache2/sites-available/tetras-back.conf +++ b/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 diff --git a/expandCertbot.sh b/expandCertbot.sh new file mode 100644 index 0000000000000000000000000000000000000000..98d9d8d571a0c68e5ff5895cc4a25815c6ec579d --- /dev/null +++ b/expandCertbot.sh @@ -0,0 +1,13 @@ +#!/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 + diff --git a/installCertbot.sh b/installCertbot.sh index 4c17d2b4c47395eea4687800e32cf749223d2eec..2b54d5824f43e20390bddca3ca3d0177f3dd90b3 100755 --- a/installCertbot.sh +++ b/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" diff --git a/installDolibarr.sh b/installDolibarr.sh index 7d28fac585aa7ab528139d93f5cd6815e0f87d4d..7892d7fc9effe43e2b0a50d33a3aa1fd16096b55 100644 --- a/installDolibarr.sh +++ b/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 + diff --git a/upgradeDolibarr.sh b/upgradeDolibarr.sh index 6193901f5f3f660cc0e1c76c5cac4f739391fc4f..2cede64157742216f5c01e830f01a52ed05e363e 100644 --- a/upgradeDolibarr.sh +++ b/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"