saving uncommitted changes in /etc prior to apt run

diff --git a/apache2/apache2.conf b/apache2/apache2.conf
index ae4b2c33dc54ba217dd9de1b264d3856d28b1d1f..319e6f83f9123ca2f039b6d28ee0e46d6c45a083 100644 (file)
--- a/apache2/apache2.conf
+++ b/apache2/apache2.conf
@@ -77,14 +77,16 @@
 # The directory where shm and other runtime files will be stored.
 #
 
-DefaultRuntimeDir ${APACHE_RUN_DIR}
+# DefaultRuntimeDir ${APACHE_RUN_DIR}
+DefaultRuntimeDir /var/run/apache2
 
 #
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 # This needs to be set in /etc/apache2/envvars
 #
-PidFile ${APACHE_PID_FILE}
+# PidFile ${APACHE_PID_FILE}
+PidFile /var/run/apache2/apache2.pid
 
 #
 # Timeout: The number of seconds before receives and sends time out.
@@ -112,8 +114,10 @@ KeepAliveTimeout 5
 
 
 # These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
+# User ${APACHE_RUN_USER}
+# Group ${APACHE_RUN_GROUP}
+User www-data
+Group www-data
 
 #
 # HostnameLookups: Log the names of clients or just their IP addresses
@@ -131,7 +135,8 @@ HostnameLookups Off
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog ${APACHE_LOG_DIR}/error.log
+# ErrorLog ${APACHE_LOG_DIR}/error.log
+ErrorLog /var/log/apache2/error.log
 
 #
 # LogLevel: Control the severity of messages logged to the error_log.

diff --git a/apache2/mods-available/info.conf b/apache2/mods-available/info.conf
index 4b1958496b120d0e10f32bd95255b87085b5e2fc..e8ab945a2b522f0f4b0d2268154221a72e950a47 100644 (file)
--- a/apache2/mods-available/info.conf
+++ b/apache2/mods-available/info.conf
@@ -6,8 +6,6 @@
        #
        <Location /server-info>
                SetHandler server-info
-               #Require local
-               #Require ip 192.0.2.0/24
                AuthName "Server Status Access"
                AuthType Basic
                AuthBasicProvider file

diff --git a/apache2/mods-enabled/info.conf b/apache2/mods-enabled/info.conf
new file mode 120000 (symlink)
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 (symlink)
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/sites-available/000-default-ssl.conf b/apache2/sites-available/000-default-ssl.conf
index a6def1d39e028217f4cc3ecbd32efd63bfa0f2d5..febcad7f3077ebd44d4351c18a668e4886b95ee4 100644 (file)
--- a/apache2/sites-available/000-default-ssl.conf
+++ b/apache2/sites-available/000-default-ssl.conf
@@ -54,6 +54,18 @@
                ServerAlias     sarah.uhu-banane.net
                ServerAlias     sarah.uhu-banane.org
 
+               WSGIScriptAlias /iredadmin /opt/www/iredadmin/iredadmin.py/
+               Alias           /iredadmin/static   /opt/www/iredadmin/static/
+               <Directory "/opt/www/iredadmin/">
+                   <IfVersion < 2.4>
+                       Order allow,deny
+                       Allow from all
+                   </IfVersion>
+                   <IfVersion >= 2.4>
+                       Require all granted
+                   </IfVersion>
+               </Directory>
+
        </VirtualHost>
 </IfModule>
 

diff --git a/motd b/motd
index 65620c95f530421a9782843420476a3a29d2a39b..8abda6baa60a5bbc4037c9b717b1fa1bd6648994 100644 (file)
--- a/motd
+++ b/motd
@@ -6,9 +6,8 @@ Debian GNU/Linux 10 (buster)
 |____/ \__,_|_|  \__,_|_| |_|
                              
 
-Man vergißt vielleicht, wo man die Friedenspfeife vergraben hat. Aber
-man vergißt niemals, wo das Beil liegt.
-               -- Mark Twain (eigl. Samuel Langhorne Clemens)
+Jede große Idee, sobald sie in Erscheinung tritt, wirkt tyrannisch.
+               -- Johann Wolfgang von Goethe
 
 Today is Setting Orange, the 22nd day of Discord in the YOLD 3187