From aec9d8bbf151b23c005b01d42b2567be249314b9 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 6 Nov 2016 06:25:02 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 1 + apache2/conf-available/other-vhosts-access-log.conf | 2 +- apache2/info_users_passwd | 3 +++ apache2/mods-available/info.conf | 6 +++++- apache2/mods-available/status.conf | 8 +++++++- apache2/mods-enabled/actions.conf | 1 + apache2/mods-enabled/actions.load | 1 + apache2/mods-enabled/cgi.load | 1 + apache2/mods-enabled/info.conf | 1 + apache2/mods-enabled/info.load | 1 + apache2/mods-enabled/rewrite.load | 1 + apache2/mods-enabled/socache_shmcb.load | 1 + apache2/mods-enabled/ssl.conf | 1 + apache2/mods-enabled/ssl.load | 1 + apache2/sites-available/default-ssl.conf | 11 ++++++++--- motd | 9 +++------ 16 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 apache2/info_users_passwd create mode 120000 apache2/mods-enabled/actions.conf create mode 120000 apache2/mods-enabled/actions.load create mode 120000 apache2/mods-enabled/cgi.load create mode 120000 apache2/mods-enabled/info.conf create mode 120000 apache2/mods-enabled/info.load create mode 120000 apache2/mods-enabled/rewrite.load create mode 120000 apache2/mods-enabled/socache_shmcb.load create mode 120000 apache2/mods-enabled/ssl.conf create mode 120000 apache2/mods-enabled/ssl.load diff --git a/.etckeeper b/.etckeeper index 3b066ca..71f1ac6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -60,6 +60,7 @@ maybe chmod 0644 'apache2/conf-available/security.conf' maybe chmod 0644 'apache2/conf-available/serve-cgi-bin.conf' maybe chmod 0755 'apache2/conf-enabled' maybe chmod 0644 'apache2/envvars' +maybe chmod 0644 'apache2/info_users_passwd' maybe chmod 0644 'apache2/magic' maybe chmod 0755 'apache2/mods-available' maybe chmod 0644 'apache2/mods-available/access_compat.load' diff --git a/apache2/conf-available/other-vhosts-access-log.conf b/apache2/conf-available/other-vhosts-access-log.conf index 5e9f5e9..2b76f4a 100644 --- a/apache2/conf-available/other-vhosts-access-log.conf +++ b/apache2/conf-available/other-vhosts-access-log.conf @@ -1,4 +1,4 @@ # Define an access log for VirtualHosts that don't define their own logfile -CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log vhost_combined +CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log full_combined # vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/apache2/info_users_passwd b/apache2/info_users_passwd new file mode 100644 index 0000000..3643e97 --- /dev/null +++ b/apache2/info_users_passwd @@ -0,0 +1,3 @@ +monitoring:$apr1$TqC87rAF$vXWiZcbRZMQIfC9XAVUgM. +uhu:$apr1$YDvmWkSk$hBCVtCkgYCtpk0nBafCJW0 +frank:$apr1$ZNUxCrHN$RL75QYUy1Y/FyFi54CAni. diff --git a/apache2/mods-available/info.conf b/apache2/mods-available/info.conf index 78a0649..0eb5c97 100644 --- a/apache2/mods-available/info.conf +++ b/apache2/mods-available/info.conf @@ -6,8 +6,12 @@ # SetHandler server-info + AuthName "Server Status Access" + AuthType Basic + AuthUserFile /etc/apache2/info_users_passwd Require local - #Require ip 192.0.2.0/24 + Require valid-user + Satisfy Any diff --git a/apache2/mods-available/status.conf b/apache2/mods-available/status.conf index 5f53ba7..dd13a38 100644 --- a/apache2/mods-available/status.conf +++ b/apache2/mods-available/status.conf @@ -5,8 +5,14 @@ SetHandler server-status - Require local #Require ip 192.0.2.0/24 + AuthName "Server Status Access" + AuthType Basic + AuthUserFile /etc/apache2/info_users_passwd + Require local + Require valid-user + Satisfy Any + # Keep track of extended status information for each request diff --git a/apache2/mods-enabled/actions.conf b/apache2/mods-enabled/actions.conf new file mode 120000 index 0000000..434d217 --- /dev/null +++ b/apache2/mods-enabled/actions.conf @@ -0,0 +1 @@ +../mods-available/actions.conf \ No newline at end of file diff --git a/apache2/mods-enabled/actions.load b/apache2/mods-enabled/actions.load new file mode 120000 index 0000000..60ebadb --- /dev/null +++ b/apache2/mods-enabled/actions.load @@ -0,0 +1 @@ +../mods-available/actions.load \ No newline at end of file diff --git a/apache2/mods-enabled/cgi.load b/apache2/mods-enabled/cgi.load new file mode 120000 index 0000000..ff02a57 --- /dev/null +++ b/apache2/mods-enabled/cgi.load @@ -0,0 +1 @@ +../mods-available/cgi.load \ No newline at end of file diff --git a/apache2/mods-enabled/info.conf b/apache2/mods-enabled/info.conf new file mode 120000 index 0000000..432cc88 --- /dev/null +++ b/apache2/mods-enabled/info.conf @@ -0,0 +1 @@ +../mods-available/info.conf \ No newline at end of file diff --git a/apache2/mods-enabled/info.load b/apache2/mods-enabled/info.load new file mode 120000 index 0000000..982891d --- /dev/null +++ b/apache2/mods-enabled/info.load @@ -0,0 +1 @@ +../mods-available/info.load \ No newline at end of file diff --git a/apache2/mods-enabled/rewrite.load b/apache2/mods-enabled/rewrite.load new file mode 120000 index 0000000..498351b --- /dev/null +++ b/apache2/mods-enabled/rewrite.load @@ -0,0 +1 @@ +../mods-available/rewrite.load \ No newline at end of file diff --git a/apache2/mods-enabled/socache_shmcb.load b/apache2/mods-enabled/socache_shmcb.load new file mode 120000 index 0000000..f729f78 --- /dev/null +++ b/apache2/mods-enabled/socache_shmcb.load @@ -0,0 +1 @@ +../mods-available/socache_shmcb.load \ No newline at end of file diff --git a/apache2/mods-enabled/ssl.conf b/apache2/mods-enabled/ssl.conf new file mode 120000 index 0000000..b0f14d1 --- /dev/null +++ b/apache2/mods-enabled/ssl.conf @@ -0,0 +1 @@ +../mods-available/ssl.conf \ No newline at end of file diff --git a/apache2/mods-enabled/ssl.load b/apache2/mods-enabled/ssl.load new file mode 120000 index 0000000..9d79723 --- /dev/null +++ b/apache2/mods-enabled/ssl.load @@ -0,0 +1 @@ +../mods-available/ssl.load \ No newline at end of file diff --git a/apache2/sites-available/default-ssl.conf b/apache2/sites-available/default-ssl.conf index 4e0f5cc..6538fd4 100644 --- a/apache2/sites-available/default-ssl.conf +++ b/apache2/sites-available/default-ssl.conf @@ -3,10 +3,15 @@ Include sites-available/default-include.conf - SSLEngine on + # SSLEngine on - SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem - SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key + SSLCertificateFile /etc/letsencrypt/live/ns1.uhu-banane.de/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/ns1.uhu-banane.de/privkey.pem + + Include /etc/letsencrypt/options-ssl-apache.conf + + #SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem + #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt diff --git a/motd b/motd index 1d499fd..ca697b4 100644 --- a/motd +++ b/motd @@ -6,11 +6,8 @@ Debian GNU/Linux 8.6 (jessie) |_| \_|___/_| -Immer, wenn ich Menschen sehe, die sich gegenseitig ihre Handys zeigen -weiß ich, daß Handys ein riesiger Fortschritt in der weiblichen -Emanzipation sind. Schließlich können sie jetzt gleichberechtigt zum -Schwanzvergleich antreten. - -- Jürgen Bruns +Wer nicht verachtet, der kann auch nicht achten. + -- Friedrich Schlegel (Lucinde) -Today is Prickle-Prickle, the 17th day of The Aftermath in the YOLD 3182 +Today is Setting Orange, the 18th day of The Aftermath in the YOLD 3182 -- 2.39.5