summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD11
-rw-r--r--httpd-adminer.conf9
3 files changed, 10 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 20b7b00faac..af605a05126 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
!PKGBUILD
!.SRCINFO
!adminer.install
+!httpd-adminer.conf
diff --git a/PKGBUILD b/PKGBUILD
index f1903f72dd6..f2af450bda2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,17 +23,6 @@ package() {
install -D -m644 $srcdir/${pkgname}-${pkgver}.php $_instdir/index.php
- # It's similar to phpMyAdmin
- cat >$pkgdir/etc/webapps/$pkgname/apache.example.conf <<EOF
- Alias /${pkgname} "/usr/share/webapps/${pkgname}"
- <Directory "/usr/share/webapps/${pkgname}">
- AllowOverride All
- Options FollowSymlinks
- Require all granted
- php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
- </Directory>
-EOF
-
cp $pkgdir/etc/webapps/$pkgname/apache.example.conf $pkgdir/etc/httpd/conf/extra/httpd-${pkgname}.conf
# echo "Include conf/extra/httpd-${pkgname}.conf" >> $pkgdir/etc/httpd/conf/httpd.conf
diff --git a/httpd-adminer.conf b/httpd-adminer.conf
new file mode 100644
index 00000000000..544e7eeb6f2
--- /dev/null
+++ b/httpd-adminer.conf
@@ -0,0 +1,9 @@
+# vim: ft=apache
+
+Alias /adminer "/usr/share/webapps/adminer"
+<Directory "/usr/share/webapps/adminer">
+ AllowOverride All
+ Options FollowSymlinks
+ Require all granted
+ php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
+</Directory>