From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 11 Jun 2020 05:45:12 +0000 (+0200)
Subject: committing changes in /etc made by "apt dist-upgrade -y"
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=eb792463adf8495b23d87759750bf13debfb7c9c;p=config%2Fsarah%2Fetc.git

committing changes in /etc made by "apt dist-upgrade -y"

Package changes:
+libjs-openlayers 2.13.1+ds2-6 all
+php-apcu 5.1.17+4.0.11-1 amd64
+php-google-recaptcha 1.2.4-1~bpo10+1 all
+php-phpmyadmin-motranslator 5.0.0-1~bpo10+1 all
+php-phpmyadmin-shapefile 2.1-3~bpo10+1 all
+php-phpmyadmin-sql-parser 4.6.1-2~bpo10+1 all
+php-psr-cache 1.0.1-1 all
+php-psr-container 1.0.0-1 all
+php-psr-log 1.1.0-1 all
+php-psr-simple-cache 1.0.1-1 all
+php-symfony-cache 3.4.22+dfsg-2+deb10u1 all
+php-symfony-expression-language 3.4.22+dfsg-2+deb10u1 all
+php-twig-extensions 1.5.4-1~bpo10+1 all
-phpmyadmin 4:4.6.6-4 all
+phpmyadmin 4:4.9.5+dfsg1-2~bpo10+1 all
---

diff --git a/.etckeeper b/.etckeeper
index e0640ef..514d2b0 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -179,6 +179,9 @@ maybe chmod 0644 'apticron/README'
 maybe chmod 0644 'apticron/apticron.conf'
 maybe chgrp 'daemon' 'at.deny'
 maybe chmod 0640 'at.deny'
+maybe chmod 0755 'avahi'
+maybe chmod 0755 'avahi/services'
+maybe chmod 0644 'avahi/services/phpmyadmin.service'
 maybe chmod 0644 'bash.bashrc'
 maybe chmod 0644 'bash_completion'
 maybe chmod 0755 'bash_completion.d'
@@ -1251,6 +1254,7 @@ maybe chmod 0644 'php/7.3/fpm/php.ini'
 maybe chmod 0755 'php/7.3/fpm/pool.d'
 maybe chmod 0644 'php/7.3/fpm/pool.d/www.conf'
 maybe chmod 0755 'php/7.3/mods-available'
+maybe chmod 0644 'php/7.3/mods-available/apcu.ini'
 maybe chmod 0644 'php/7.3/mods-available/calendar.ini'
 maybe chmod 0644 'php/7.3/mods-available/ctype.ini'
 maybe chmod 0644 'php/7.3/mods-available/dom.ini'
diff --git a/avahi/services/phpmyadmin.service b/avahi/services/phpmyadmin.service
new file mode 100644
index 0000000..077c926
--- /dev/null
+++ b/avahi/services/phpmyadmin.service
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+ <name replace-wildcards="yes">phpMyAdmin on %h</name>
+  <service>
+   <type>_http._tcp</type>
+   <port>80</port>
+   <txt-record>path=/phpmyadmin/</txt-record>
+  </service>
+</service-group>
diff --git a/php/7.3/apache2/conf.d/20-apcu.ini b/php/7.3/apache2/conf.d/20-apcu.ini
new file mode 120000
index 0000000..434789b
--- /dev/null
+++ b/php/7.3/apache2/conf.d/20-apcu.ini
@@ -0,0 +1 @@
+/etc/php/7.3/mods-available/apcu.ini
\ No newline at end of file
diff --git a/php/7.3/cli/conf.d/20-apcu.ini b/php/7.3/cli/conf.d/20-apcu.ini
new file mode 120000
index 0000000..434789b
--- /dev/null
+++ b/php/7.3/cli/conf.d/20-apcu.ini
@@ -0,0 +1 @@
+/etc/php/7.3/mods-available/apcu.ini
\ No newline at end of file
diff --git a/php/7.3/fpm/conf.d/20-apcu.ini b/php/7.3/fpm/conf.d/20-apcu.ini
new file mode 120000
index 0000000..434789b
--- /dev/null
+++ b/php/7.3/fpm/conf.d/20-apcu.ini
@@ -0,0 +1 @@
+/etc/php/7.3/mods-available/apcu.ini
\ No newline at end of file
diff --git a/php/7.3/mods-available/apcu.ini b/php/7.3/mods-available/apcu.ini
new file mode 100644
index 0000000..231a43c
--- /dev/null
+++ b/php/7.3/mods-available/apcu.ini
@@ -0,0 +1 @@
+extension=apcu.so
diff --git a/phpmyadmin/apache.conf b/phpmyadmin/apache.conf
index b9793ab..c97b1d1 100644
--- a/phpmyadmin/apache.conf
+++ b/phpmyadmin/apache.conf
@@ -6,47 +6,14 @@ Alias /phpmyadmin /usr/share/phpmyadmin
     Options SymLinksIfOwnerMatch
     DirectoryIndex index.php
 
-    <IfModule mod_php5.c>
-        <IfModule mod_mime.c>
-            AddType application/x-httpd-php .php
-        </IfModule>
-        <FilesMatch ".+\.php$">
-            SetHandler application/x-httpd-php
-        </FilesMatch>
-
-        php_value include_path .
+    # limit libapache2-mod-php to files and directories necessary by pma
+    <IfModule mod_php7.c>
         php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
-        php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/php/php-php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/:/usr/share/doc/phpmyadmin/:/usr/share/php/phpseclib/
-        php_admin_value mbstring.func_overload 0
-    </IfModule>
-    <IfModule mod_php.c>
-        <IfModule mod_mime.c>
-            AddType application/x-httpd-php .php
-        </IfModule>
-        <FilesMatch ".+\.php$">
-            SetHandler application/x-httpd-php
-        </FilesMatch>
-
-        php_value include_path .
-        php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
-        php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/php/php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/:/usr/share/doc/phpmyadmin/:/usr/share/php/phpseclib/
-        php_admin_value mbstring.func_overload 0
+        php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/php/php-php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/:/usr/share/doc/phpmyadmin/:/usr/share/php/phpseclib/:/usr/share/php/PhpMyAdmin/:/usr/share/php/Symfony/:/usr/share/php/Twig/:/usr/share/php/Twig-Extensions/:/usr/share/php/ReCaptcha/:/usr/share/php/Psr/Container/:/usr/share/php/Psr/Cache/:/usr/share/php/Psr/Log/:/usr/share/php/Psr/SimpleCache/
     </IfModule>
 
 </Directory>
 
-# Authorize for setup
-<Directory /usr/share/phpmyadmin/setup>
-    <IfModule mod_authz_core.c>
-        <IfModule mod_authn_file.c>
-            AuthType Basic
-            AuthName "phpMyAdmin Setup"
-            AuthUserFile /etc/phpmyadmin/htpasswd.setup
-        </IfModule>
-        Require valid-user
-    </IfModule>
-</Directory>
-
 # Disallow web access to directories that don't need it
 <Directory /usr/share/phpmyadmin/templates>
     Require all denied
@@ -54,7 +21,4 @@ Alias /phpmyadmin /usr/share/phpmyadmin
 <Directory /usr/share/phpmyadmin/libraries>
     Require all denied
 </Directory>
-<Directory /usr/share/phpmyadmin/setup/lib>
-    Require all denied
-</Directory>
 
diff --git a/phpmyadmin/config.inc.php b/phpmyadmin/config.inc.php
index 39b1664..a6c3cb4 100644
--- a/phpmyadmin/config.inc.php
+++ b/phpmyadmin/config.inc.php
@@ -37,11 +37,6 @@ if (check_file_access('/var/lib/phpmyadmin/blowfish_secret.inc.php')) {
     require('/var/lib/phpmyadmin/blowfish_secret.inc.php');
 }
 
-// Load autoconf local config
-if (check_file_access('/var/lib/phpmyadmin/config.inc.php')) {
-    require('/var/lib/phpmyadmin/config.inc.php');
-}
-
 /**
  * Server(s) configuration
  */
diff --git a/phpmyadmin/lighttpd.conf b/phpmyadmin/lighttpd.conf
index eae58a4..be39234 100644
--- a/phpmyadmin/lighttpd.conf
+++ b/phpmyadmin/lighttpd.conf
@@ -1,30 +1,12 @@
 # Alias for phpMyAdmin directory
-alias.url += ( 
+alias.url += (
 	"/phpmyadmin" => "/usr/share/phpmyadmin",
 )
 
 # Disallow access to libraries
-$HTTP["url"] =~ "^/phpmyadmin/templates" { 
-    url.access-deny = ( "" ) 
+$HTTP["url"] =~ "^/phpmyadmin/templates" {
+    url.access-deny = ( "" )
 }
-$HTTP["url"] =~ "^/phpmyadmin/libraries" { 
-    url.access-deny = ( "" ) 
+$HTTP["url"] =~ "^/phpmyadmin/libraries" {
+    url.access-deny = ( "" )
 }
-$HTTP["url"] =~ "^/phpmyadmin/setup/lib" { 
-    url.access-deny = ( "" ) 
-}
-
-# Limit access to setup script
-$HTTP["url"] =~ "^/phpmyadmin/setup" {
-	auth.backend = "htpasswd"
-	auth.backend.htpasswd.userfile = "/etc/phpmyadmin/htpasswd.setup"
-	auth.require = (
-		"/" => (
-			"method" => "basic",
-			"realm" => "phpMyAdmin Setup",
-			"require" => "valid-user"
-		)
-	)
-}
-
-