From: Frank Brehm <frank@brehm-online.com>
Date: Sat, 17 Sep 2016 04:25:55 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f8dc1337c816d738d3662f95b71e64ed8be6316d;p=config%2Fsarah%2Fetc.git

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index 2c5315c..4f7795c 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -799,6 +799,7 @@ maybe chmod 0644 'nginx/templates/hsts.tmpl'
 maybe chmod 0644 'nginx/templates/iredadmin.tmpl'
 maybe chmod 0644 'nginx/templates/misc.tmpl'
 maybe chmod 0644 'nginx/templates/php-catchall.tmpl'
+maybe chmod 0644 'nginx/templates/phpmyadmin.tmpl'
 maybe chmod 0644 'nginx/templates/redirect_to_https.tmpl'
 maybe chmod 0644 'nginx/templates/roundcube.tmpl'
 maybe chmod 0644 'nginx/templates/sogo.tmpl'
diff --git a/nginx/conf.d/00-default.conf b/nginx/conf.d/00-default.conf
index c9eece2..083cd15 100644
--- a/nginx/conf.d/00-default.conf
+++ b/nginx/conf.d/00-default.conf
@@ -48,6 +48,7 @@ server {
     include /etc/nginx/templates/roundcube.tmpl;
     include /etc/nginx/templates/iredadmin.tmpl;
     include /etc/nginx/templates/sogo.tmpl;
+    include /etc/nginx/templates/phpmyadmin.tmpl;
 
     # PHP applications. WARNING: php-catchall.tmpl should be loaded after
     # other php web applications.
diff --git a/nginx/templates/phpmyadmin.tmpl b/nginx/templates/phpmyadmin.tmpl
new file mode 100644
index 0000000..228199b
--- /dev/null
+++ b/nginx/templates/phpmyadmin.tmpl
@@ -0,0 +1,36 @@
+# phpmyadmin
+location /phpmyadmin {
+    alias   /usr/share/phpmyadmin;
+    index   index.php;
+}
+
+location ~ ^/phpmyadmin/libraries {
+    deny all;
+}
+
+location ~ ^/phpmyadmin/setup/lib {
+    deny all;
+}
+
+location ~ ^/phpmyadmin/setup/(.+\.php)$ {
+    include                 fastcgi_params;
+    auth_basic              "phpMyAdmin Setup";
+    auth_basic_user_file    "/etc/phpmyadmin/htpasswd.setup";
+    alias                   /usr/share/phpmyadmin/setup/$1;
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    fastcgi_pass            php_workers;
+    fastcgi_index           index.php;
+}
+
+location ~ ^/phpmyadmin/(.+\.php)$ {
+    include                 fastcgi_params;
+    alias                   /usr/share/phpmyadmin/$1;
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    fastcgi_pass            php_workers;
+    fastcgi_index           index.php;
+}
+
+location ~ ^/phpMyAdmin {
+    rewrite ^/* /phpmyadmin last;
+}
+