saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 38c5defe5ecfa8f6204927d4cfd57718868b4089..3740a23d47b852d22c9c576478d8029cf8257f40 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3288,6 +3288,7 @@ maybe chmod 0755 'letsencrypt/live/mediawiki.moellein.homeip.net'
 maybe chmod 0644 'letsencrypt/live/mediawiki.moellein.homeip.net/README'
 maybe chmod 0755 'letsencrypt/live/moellein.homeip.net'
 maybe chmod 0644 'letsencrypt/live/moellein.homeip.net/README'
+maybe chmod 0644 'letsencrypt/live/moellein.homeip.net/dhparams_2048.pem'
 maybe chmod 0644 'letsencrypt/options-ssl-apache.conf'
 maybe chmod 0755 'letsencrypt/renewal'
 maybe chmod 0755 'letsencrypt/renewal-hooks'

diff --git a/apache2/sites-available/ccu.conf b/apache2/sites-available/ccu.conf
index 3fc7c04bf67942a2fc63af108e05a1a717ba7996..3f6a7c53fb7445a1a2fbffaeb7d1f6c7dbade1ef 100644 (file)
--- a/apache2/sites-available/ccu.conf
+++ b/apache2/sites-available/ccu.conf
@@ -21,6 +21,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/ck.conf b/apache2/sites-available/ck.conf
index 5999d551c7101078ddc76e28ca7000547b2456d0..0b248c14e8155e82c8763c756c4c208a619e351a 100644 (file)
--- a/apache2/sites-available/ck.conf
+++ b/apache2/sites-available/ck.conf
@@ -60,6 +60,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/collabora.conf b/apache2/sites-available/collabora.conf
index f1b1140e6f3d3846877c1aabf2bb0af91090efdc..b67beaa94eca7a1e6878af9ed837ae8a997d72c4 100644 (file)
--- a/apache2/sites-available/collabora.conf
+++ b/apache2/sites-available/collabora.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:443>
        ServerName collabora.moellein.homeip.net:443
-       ServerAlias collabora.moellein.homeip.net:443
-       #Options -Indexes
+       ServerAlias collabora.moellein.homeip.net
+       Options -Indexes
 
        # SSL configuration, you may want to take the easy route instead and use Lets Encrypt!
        SSLEngine on
@@ -9,7 +9,9 @@
        SSLProtocol all -SSLv2 -SSLv3
        SSLCipherSuite ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
        SSLHonorCipherOrder on
-
+       <Directory />
+               Require all granted
+       </Directory>
        # Encoded slashes need to be allowed
        AllowEncodedSlashes NoDecode
        # Enable and configure SSL Proxy
@@ -39,8 +41,8 @@
        # Download as, Fullscreen presentation and Image upload operations
        ProxyPass /lool https://127.0.0.1:9980/lool
        ProxyPassReverse /lool https://127.0.0.1:9980/lool
-       ServerAlias collabora.moellein.homeip.net
        SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
        SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
        SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+       SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
 </VirtualHost>

diff --git a/apache2/sites-available/fhem.conf b/apache2/sites-available/fhem.conf
index 0af1c42e40d9f112f5d6ecbad820d990be7005d2..3548248f526e7c7720fc02cf1275898d4b5fd0ac 100644 (file)
--- a/apache2/sites-available/fhem.conf
+++ b/apache2/sites-available/fhem.conf
@@ -11,8 +11,8 @@
                        AuthName EnterPassword
                        AuthType Basic
                        require user fhem 
-                       Order deny,allow
-                       Allow from all
+#                      Order deny,allow
+#                      Allow from all
                </Proxy>
                ProxyPass / http://localhost:8083/
                ProxyPassReverse / http://localhost:8083/
@@ -21,6 +21,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/git.conf b/apache2/sites-available/git.conf
index 3f1a10d377c7c9f7139c8eccd7cabc26bc32fd34..03f1dd95e5b69a0356cd9ce4e87e0cdcc90457bd 100644 (file)
--- a/apache2/sites-available/git.conf
+++ b/apache2/sites-available/git.conf
@@ -1,6 +1,6 @@
 <IfModule mod_ssl.c>
        <VirtualHost *:443>
-               ServerName moellein.homeip.net
+               ServerName git.moellein.homeip.net
                ServerAlias git.moellein.homeip.net
                DocumentRoot /var/www/gitweb/
                ScriptAlias /gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
@@ -16,8 +16,9 @@
                        Options +ExecCGI +FollowSymLinks +SymLinksIfOwnerMatch
                        SetEnv GITWEB_CONFIG /etc/gitweb.conf
                        AllowOverride All
-                       order allow,deny
-                       Allow from all
+#                      order allow,deny
+#                      Allow from all
+#                      Require all granted
                        AddHandler cgi-script cgi
                        DirectoryIndex gitweb.cgi
                </Directory>
@@ -26,6 +27,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/mediawiki.ssh.conf b/apache2/sites-available/mediawiki.ssh.conf
index 9594872c4f44323ed1a7249b2a85e9138a7d3895..a037b3dc7b1eb0a8c69595a5b64b357f0adc1165 100644 (file)
--- a/apache2/sites-available/mediawiki.ssh.conf
+++ b/apache2/sites-available/mediawiki.ssh.conf
@@ -46,6 +46,6 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/nextcloud.conf b/apache2/sites-available/nextcloud.conf
index a76874deab80eb99febb8cc236a5e0c1ea809b04..87b2e0c9635ec93bc0ab34bf66a119064a2bb5b0 100644 (file)
--- a/apache2/sites-available/nextcloud.conf
+++ b/apache2/sites-available/nextcloud.conf
@@ -6,7 +6,7 @@
                Header set Referrer-Policy "no-referrer"
                ServerAdmin webmaster@localhost
                DocumentRoot /var/www/nextcloud/
-               ServerName moellein.homeip.net
+               ServerName nextcloud.moellein.homeip.net:443
                ServerAlias nextcloud.moellein.homeip.net
                <Directory />
                        Options FollowSymLinks
@@ -17,12 +17,14 @@
                        SetEnv HTTP_HOME /var/www/nextcloud
                        Options Indexes FollowSymLinks MultiViews
                        AllowOverride All
-                       Order allow,deny
-                       allow from all
+#                      Order allow,deny
+#                      allow from all
+                       Require all granted
                </Directory>
                <LocationMatch "/(data|conf|bin|inc)/">
-                       Order allow,deny
-                       Deny from all
+#                      Order allow,deny
+#                      Deny from all
+                       Require all denied 
                        Satisfy All
                </LocationMatch>
                RewriteEngine on
@@ -30,16 +32,17 @@
                <Directory "/var/www/nextcloud/cgi-bin">
                        AllowOverride None
                        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-                       Order allow,deny
-                       Allow from all
+#                      Order allow,deny
+#                      Allow from all
+                       Require all granted
                </Directory>
 
 
                # Possible values include: debug, info, notice, warn, error, crit,
                # alert, emerg.
                LogLevel debug 
-               ErrorLog ${APACHE_LOG_DIR}/nextcloud_error.log
-               CustomLog ${APACHE_LOG_DIR}/nextcloud_ssl_access.log combined
+               ErrorLog ${APACHE_LOG_DIR}/nextcloud.moellein.homeip.net_error.log
+               CustomLog ${APACHE_LOG_DIR}/nextcloud.moellein.homeip.net_ssl_access.log combined
 
                #   SSL Engine Switch:
                #   Enable/Disable SSL for this virtual host.
@@ -55,6 +58,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/tine20.conf b/apache2/sites-available/tine20.conf
index 2346dd03f811de4b7cf86dc666b9273ff4561af7..c3d54790b98d38152e632f31191dba50d3922160 100644 (file)
--- a/apache2/sites-available/tine20.conf
+++ b/apache2/sites-available/tine20.conf
@@ -1,18 +1,20 @@
+SSLStrictSNIVHostCheck off
 <IfModule mod_ssl.c>
-       <VirtualHost _default_:443>
+       <VirtualHost *:443>
                ServerAdmin webmaster@localhost
-               ServerName moellein.homeip.net
-               ServerAlias 
-               DocumentRoot /var/www/tine20
-               <Directory />
+               ServerName moellein.homeip.net:443
+               ServerAlias moellein.homeip.net 
+               DocumentRoot "/var/www/tine20/"
+               <Directory "/">
                        Options FollowSymLinks
                        AllowOverride all
                </Directory>
-               <Directory /var/www/tine20>
+               <Directory /var/www/tine20/>
                        Options Indexes FollowSymLinks MultiViews
                        AllowOverride None
-                       Order allow,deny
-                       allow from all
+#                      Order allow,deny
+#                      allow from all
+                       Require all granted
                </Directory>
                RewriteEngine on
                RewriteRule /Microsoft-Server-ActiveSync(.*) /var/www/tine20/index.php$1 [E=REDIRECT_ACTIVESYNC:true,E=REMOTE_USER:%{HTTP:Authorization}]
@@ -22,25 +24,27 @@
                <Directory "/usr/lib/cgi-bin">
                        AllowOverride None
                        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-                       Order allow,deny
-                       Allow from all
+#                      Order allow,deny
+#                      Allow from all
+                       Require all granted
                </Directory>
 
-               ErrorLog ${APACHE_LOG_DIR}/error.log
 
                # Possible values include: debug, info, notice, warn, error, crit,
                # alert, emerg.
-               LogLevel warn
+               LogLevel debug 
 
-               CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
+               ErrorLog ${APACHE_LOG_DIR}/moellein.homeip.net_error.log
+               CustomLog ${APACHE_LOG_DIR}/moellein.homeip.net_ssl_access.log combined
 
                Alias /doc/ "/usr/share/doc/"
                <Directory "/usr/share/doc/">
                        Options Indexes MultiViews FollowSymLinks
                        AllowOverride None
-                       Order deny,allow
+#                      Order deny,allow
                        Deny from all
-                       Allow from 127.0.0.0/255.0.0.0 ::1/128
+#                      Allow from 127.0.0.0/255.0.0.0 ::1/128
+                       Require all granted 
                </Directory>
 
                #   SSL Engine Switch:
@@ -48,12 +52,10 @@
                SSLEngine on
                SSLProtocol all -SSLv2 -SSLv3
 
-               SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
-               SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
                <FilesMatch "\.(cgi|shtml|phtml|php)$">
                        SSLOptions +StdEnvVars
                </FilesMatch>
-               <Directory /usr/lib/cgi-bin>
+               <Directory "/usr/lib/cgi-bin/">
                        SSLOptions +StdEnvVars
                </Directory>
                BrowserMatch "MSIE [2-6]" \
@@ -61,6 +63,9 @@
                        downgrade-1.0 force-response-1.0
                # MSIE 7 and newer should be able to use keepalive
                BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+               SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
+               SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
                SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/tv.conf b/apache2/sites-available/tv.conf
index 4bea8781053e4e5a3d068709590f855bcfa5ad20..07a23ff883c4337b97132bb9816fb679ca581a05 100644 (file)
--- a/apache2/sites-available/tv.conf
+++ b/apache2/sites-available/tv.conf
@@ -21,6 +21,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/webssh.conf b/apache2/sites-available/webssh.conf
index 5c8870f65aaf4835d99c9feec5420345e2e5edbd..eeea3d80f749a380ac35305d10443a2145d1517a 100644 (file)
--- a/apache2/sites-available/webssh.conf
+++ b/apache2/sites-available/webssh.conf
@@ -23,6 +23,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-available/wiki.ssl.conf b/apache2/sites-available/wiki.ssl.conf
index 910b8a4ee6ce03c425b14ddaa814bfefb547c7bd..8754bc443ce552d88cb0d876adb5a3ac940eaa14 100644 (file)
--- a/apache2/sites-available/wiki.ssl.conf
+++ b/apache2/sites-available/wiki.ssl.conf
@@ -46,6 +46,7 @@
                Include /etc/letsencrypt/options-ssl-apache.conf
                SSLCertificateFile /etc/letsencrypt/live/moellein.homeip.net/cert.pem
                SSLCertificateKeyFile /etc/letsencrypt/live/moellein.homeip.net/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLCertificateChainFile /etc/letsencrypt/live/moellein.homeip.net/chain.pem
+               SSLOpenSSLConfCmd DHParameters /etc/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
        </VirtualHost>
 </IfModule>

diff --git a/apache2/sites-enabled/ccu.conf b/apache2/sites-enabled/ccu.conf
deleted file mode 120000 (symlink)
index b083612..0000000
--- a/apache2/sites-enabled/ccu.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/ccu.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/ck.conf b/apache2/sites-enabled/ck.conf
deleted file mode 120000 (symlink)
index b081fde..0000000
--- a/apache2/sites-enabled/ck.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/ck.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/collabora.conf b/apache2/sites-enabled/collabora.conf
new file mode 120000 (symlink)
index 0000000..60eba08
--- /dev/null
+++ b/apache2/sites-enabled/collabora.conf
@@ -0,0 +1 @@
+../sites-available/collabora.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/default-ssl.conf b/apache2/sites-enabled/default-ssl.conf
deleted file mode 120000 (symlink)
index d02890b..0000000
--- a/apache2/sites-enabled/default-ssl.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/default-ssl.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/default.conf b/apache2/sites-enabled/default.conf
deleted file mode 120000 (symlink)
index 032e6bc..0000000
--- a/apache2/sites-enabled/default.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/default.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/mediawiki.ssh.conf b/apache2/sites-enabled/mediawiki.ssh.conf
deleted file mode 120000 (symlink)
index 99ec97a..0000000
--- a/apache2/sites-enabled/mediawiki.ssh.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/mediawiki.ssh.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/nextcloud.conf b/apache2/sites-enabled/nextcloud.conf
index dced1f805bfed669563b22c789118d4206963bac..a0c59cb3e3145f8d56656049081902a1d73bd18a 120000 (symlink)
--- a/apache2/sites-enabled/nextcloud.conf
+++ b/apache2/sites-enabled/nextcloud.conf
@@ -1 +1 @@
-/etc/apache2/sites-available/nextcloud.conf
\ No newline at end of file
+../sites-available/nextcloud.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/tv.conf b/apache2/sites-enabled/tv.conf
deleted file mode 120000 (symlink)
index 450994f..0000000
--- a/apache2/sites-enabled/tv.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/tv.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/webssh.conf b/apache2/sites-enabled/webssh.conf
deleted file mode 120000 (symlink)
index 9529eaa..0000000
--- a/apache2/sites-enabled/webssh.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/webssh.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/zm.conf b/apache2/sites-enabled/zm.conf
deleted file mode 120000 (symlink)
index 531b765..0000000
--- a/apache2/sites-enabled/zm.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/zm.conf
\ No newline at end of file

diff --git a/apt/sources.list b/apt/sources.list
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6981b26bf22aed7fa1d56f35c0ad8c539c1b6f22 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -0,0 +1 @@
+deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu1804 ./

diff --git a/cups/printers.conf b/cups/printers.conf
index b1281f2a5dc123e3cdedc83938e0a035cba172c7..175ec61c8e92a3a42e64f6d814a6f4e8ba50ef49 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -2,14 +2,14 @@
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-UUID urn:uuid:11ec4cb9-ce86-3322-457d-2e3aeebf047f
+UUID urn:uuid:c6d611f7-6924-3e23-6bb3-a623d0cae267
 Info 
 Location 
 MakeModel Color LaserJet MFP M277dw
 DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 State Idle
-StateTime 1540338246
-ConfigTime 1540338254
+StateTime 1540355763
+ConfigTime 1540355777
 Type 4188
 Accepting Yes
 Shared No

diff --git a/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem b/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
new file mode 100644 (file)
index 0000000..19f5448
--- /dev/null
+++ b/letsencrypt/live/moellein.homeip.net/dhparams_2048.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA7Akp33SoPvqH7Z+GqM9Pg2vHE9BAdpNli/GkgA/SPIxJnx043t9j
+TiPlcC9G0NbddLalI7v16ExCKjmIwWBZrnKBm5r0nuL8ZO1oQXpD9zb3FHWQVzoj
+N2cVdgZVJ3rEhpxj+YNiNLswIIUgMkvU00GubL38M2S6a5crj/6OeKGtmaSt9kFR
+qg0ll/sHsdZiZlcnL0y78j5L34csr5BomT+M6Thu/a1i7NN6pS/EnCUj0T1JONum
+BQ7xh5HWxY8G46JOEXSd9Oi/YO87WXP8F6lZuOp5ce3QOvzTqxieDoie0D3e5o4I
+j9nRcQ6yYVTLvRe/OkmTnlDbRUyBcNgsuwIBAg==
+-----END DH PARAMETERS-----

diff --git a/redis/redis.conf b/redis/redis.conf
index a27c4b9c8359718eb2009e5b265356e7fafbc777..9124c74ddb1e793ec5b379ab945a5d178dc17764 100644 (file)
--- a/redis/redis.conf
+++ b/redis/redis.conf
@@ -89,7 +89,7 @@ protected-mode yes
 
 # Accept connections on the specified port, default is 6379 (IANA #815344).
 # If port 0 is specified Redis will not listen on a TCP socket.
-port 6379
+port 0 
 
 # TCP listen() backlog.
 #
@@ -106,8 +106,8 @@ tcp-backlog 511
 # incoming connections. There is no default, so Redis will not listen
 # on a unix socket when not specified.
 #
-# unixsocket /var/run/redis/redis-server.sock
-# unixsocketperm 700
+unixsocket /var/run/redis/redis.sock
+unixsocketperm 770
 
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 0