From: mhoellein <mario@hoellein.online>
Date: Tue, 8 Jun 2021 12:41:00 +0000 (+0200)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=fab71a49e6a44792740f780122670048c312540f;p=vserver

committing changes in /etc made by "apt-get upgrade"

Package changes:
-apache2 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 amd64
-apache2-bin 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 amd64
-apache2-data 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 all
-apache2-utils 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 amd64
+apache2 2.4.48-1+ubuntu20.04.1+deb.sury.org+1 amd64
+apache2-bin 2.4.48-1+ubuntu20.04.1+deb.sury.org+1 amd64
+apache2-data 2.4.48-1+ubuntu20.04.1+deb.sury.org+1 all
+apache2-utils 2.4.48-1+ubuntu20.04.1+deb.sury.org+1 amd64
---

diff --git a/.etckeeper b/.etckeeper
index b957ec274..29ef4a91b 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1578,6 +1578,7 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
+maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644
index 000000000..e69de29bb
diff --git a/logrotate.d/apache2 b/logrotate.d/apache2
index 37c5f22e4..9d2356dad 100644
--- a/logrotate.d/apache2
+++ b/logrotate.d/apache2
@@ -1,20 +1,20 @@
 /var/log/apache2/*.log {
-	daily
-	missingok
-	rotate 14
-	compress
-	delaycompress
-	notifempty
-	create 640 root adm
-	sharedscripts
-	postrotate
-                if invoke-rc.d apache2 status > /dev/null 2>&1; then \
-                    invoke-rc.d apache2 reload > /dev/null 2>&1; \
-                fi;
-	endscript
-	prerotate
-		if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
-			run-parts /etc/logrotate.d/httpd-prerotate; \
-		fi; \
-	endscript
+    daily
+    missingok
+    rotate 14
+    compress
+    delaycompress
+    notifempty
+    create 640 root adm
+    sharedscripts
+    prerotate
+	if [ -d /etc/logrotate.d/httpd-prerotate ]; then
+	    run-parts /etc/logrotate.d/httpd-prerotate
+	fi
+    endscript
+    postrotate
+	if pgrep -f ^/usr/sbin/apache2 > /dev/null; then
+	    invoke-rc.d apache2 reload
+	fi
+    endscript
 }