[arch-commits] Commit in dokuwiki/trunk (PKGBUILD apache.example.conf)

[Sergej Pupykin]

    Date: Friday, November 15, 2013 @ 16:34:47
  Author: spupykin
Revision: 101047

upgpkg: dokuwiki 20131028.rc-1

upd

Added:
  dokuwiki/trunk/apache.example.conf
Modified:
  dokuwiki/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   26 ++++++++++++--------------
 apache.example.conf |    8 ++++++++
 2 files changed, 20 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-15 15:10:25 UTC (rev 101046)
+++ PKGBUILD	2013-11-15 15:34:47 UTC (rev 101047)
@@ -3,9 +3,11 @@
 # Contributor: Sébastien Luttringer
 
 pkgname=dokuwiki
-pkgver=20130510
-_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-pkgrel=4
+pkgver=20131028.rc
+[ "x${pkgver:9:2}" == "xrc" ] && \
+  _pkgver=rc${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} || \
+  _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}${pkgver:9:1}
+pkgrel=1
 pkgdesc='Simple to use and highly versatile Open Source wiki software'
 arch=('any')
 url='http://www.splitbrain.org/projects/dokuwiki'
@@ -13,8 +15,10 @@
 depends=('php')
 backup=('etc/webapps/dokuwiki/.htaccess')
 options=('!strip')
-source=("http://www.splitbrain.org/_media/projects/dokuwiki/dokuwiki-${_pkgver}.tgz")
-md5sums=('9cb5bb79c0445df849845b586e872677')
+source=("http://download.dokuwiki.org/src/dokuwiki/dokuwiki-${_pkgver}.tgz"
+	"apache.example.conf")
+md5sums=('f476b54a3679d35cdd8746db57c9c6a3'
+         'c5bed40abf5bb737bad8df29bb7020dc')
 
 package() {
   cd "$pkgdir"
@@ -25,14 +29,6 @@
   mv usr/share/webapps/dokuwiki/data var/lib/dokuwiki
   ln -s {../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki}/data
 
-  # move plugins in var
-  mv usr/share/webapps/dokuwiki/lib/plugins var/lib/dokuwiki
-  ln -s {../../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki/lib}/plugins
-
-  # move templates in var
-  mv usr/share/webapps/dokuwiki/lib/tpl var/lib/dokuwiki
-  ln -s {../../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki/lib}/tpl
-
   # move config in /etc
   mv usr/share/webapps/dokuwiki/conf etc/webapps/dokuwiki
   chmod g=rwx etc/webapps/dokuwiki
@@ -47,9 +43,11 @@
   ln -s /etc/webapps/dokuwiki/.htaccess usr/share/webapps/dokuwiki/.htaccess
 
   # fix rights and ownership
-  chown http:http var/lib/dokuwiki/plugins
   chown -R http:http var/lib/dokuwiki/data
   chown -R http:http etc/webapps/dokuwiki
+
+  # apache config
+  install -Dm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/dokuwiki/apache.example.conf
 }
 
 # vim:set ts=2 sw=2 et:

Added: apache.example.conf
===================================================================
--- apache.example.conf	                        (rev 0)
+++ apache.example.conf	2013-11-15 15:34:47 UTC (rev 101047)
@@ -0,0 +1,8 @@
+Alias /dokuwiki /usr/share/webapps/dokuwiki
+<Directory /usr/share/webapps/dokuwiki/>
+    Options +FollowSymLinks
+    AllowOverride All
+    order allow,deny
+    allow from all
+    php_admin_value open_basedir "/tmp/:/usr/share/webapps/dokuwiki/:/etc/webapps/dokuwiki/:/var/lib/dokuwiki/"
+</Directory>