From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 27 Jan 2021 12:14:13 +0000 (+0100)
Subject: committing changes in /etc made by "apt dist-upgrade -y"
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=c466710f63eb905a9696ca1da7478076e2402230;p=config%2Fsarah%2Fetc.git

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

Package changes:
+javascript-common 11 all
+libjs-bootstrap4 4.3.1+dfsg2-1 all
+libjs-codemirror 5.43.0-1+deb10u1 all
+libjs-jquery-mousewheel 1:3.1.13-2 all
+libjs-jquery-timepicker 1.2-1 all
+libjs-jquery-ui 1.12.1+dfsg-5 all
+libjs-popper.js 1.14.6+ds2-1 all
-php-google-recaptcha 1.2.4-1~bpo10+1 all
+php-google-recaptcha 1.2.4-3~bpo10+1 all
+php-mariadb-mysql-kbs 1.2.12-1~bpo10+1 all
+php-symfony-config 3.4.22+dfsg-2+deb10u1 all
+php-symfony-dependency-injection 3.4.22+dfsg-2+deb10u1 all
+php-symfony-filesystem 3.4.22+dfsg-2+deb10u1 all
+php-symfony-yaml 3.4.22+dfsg-2+deb10u1 all
+php-twig-i18n-extension 3.0.0-2~bpo10+1 all
-phpmyadmin 4:4.9.7+dfsg1-1~bpo10+1 all
+phpmyadmin 4:5.0.4+dfsg2-1~bpo10+1 all
-sudo 1.8.27-1+deb10u2 amd64
+sudo 1.8.27-1+deb10u3 amd64
---

diff --git a/.etckeeper b/.etckeeper
index 1ff5b97..48457e5 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -109,6 +109,7 @@ maybe chmod 0644 'amavis/en_US/template-virus-recipient.txt'
 maybe chmod 0644 'amavis/en_US/template-virus-sender.txt'
 maybe chmod 0755 'apache2'
 maybe chmod 0755 'apache2/conf-available'
+maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
 maybe chmod 0644 'apache2/conf-available/php7.0-fpm.conf'
 maybe chmod 0644 'apache2/conf-available/php7.3-fpm.conf'
 maybe chmod 0755 'apache2/mods-available'
@@ -997,6 +998,10 @@ maybe chmod 0644 'libaudit.conf'
 maybe chmod 0755 'libnl-3'
 maybe chmod 0644 'libnl-3/classid'
 maybe chmod 0644 'libnl-3/pktloc'
+maybe chmod 0755 'lighttpd'
+maybe chmod 0755 'lighttpd/conf-available'
+maybe chmod 0644 'lighttpd/conf-available/90-javascript-alias.conf'
+maybe chmod 0755 'lighttpd/conf-enabled'
 maybe chmod 0644 'locale.alias'
 maybe chmod 0644 'locale.gen'
 maybe chmod 0644 'locale.gen.bak'
diff --git a/apache2/conf-available/javascript-common.conf b/apache2/conf-available/javascript-common.conf
new file mode 100644
index 0000000..7e5dbd3
--- /dev/null
+++ b/apache2/conf-available/javascript-common.conf
@@ -0,0 +1,5 @@
+Alias /javascript /usr/share/javascript/
+
+<Directory "/usr/share/javascript/">
+	Options FollowSymLinks MultiViews
+</Directory>
diff --git a/lighttpd/conf-available/90-javascript-alias.conf b/lighttpd/conf-available/90-javascript-alias.conf
new file mode 100644
index 0000000..a8b442f
--- /dev/null
+++ b/lighttpd/conf-available/90-javascript-alias.conf
@@ -0,0 +1 @@
+alias.url += ("/javascript" => "/usr/share/javascript")
diff --git a/lighttpd/conf-enabled/90-javascript-alias.conf b/lighttpd/conf-enabled/90-javascript-alias.conf
new file mode 120000
index 0000000..dc909f6
--- /dev/null
+++ b/lighttpd/conf-enabled/90-javascript-alias.conf
@@ -0,0 +1 @@
+../conf-available/90-javascript-alias.conf
\ No newline at end of file
diff --git a/phpmyadmin/apache.conf b/phpmyadmin/apache.conf
index 2c1284c..9d40aa2 100644
--- a/phpmyadmin/apache.conf
+++ b/phpmyadmin/apache.conf
@@ -9,7 +9,7 @@ Alias /phpmyadmin /usr/share/phpmyadmin
     # 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/:/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/:/usr/share/php/Bacon/BaconQrCode/:/usr/share/php/DASPRiD/Enum/
+        php_admin_value open_basedir /usr/share/phpmyadmin/:/usr/share/doc/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/:/usr/share/javascript/
     </IfModule>
 
 </Directory>