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

[Sergej Pupykin]

    Date: Monday, January 13, 2014 @ 21:31:53
  Author: spupykin
Revision: 103944

upgpkg: owncloud 6.0.0.a-3

upd

Modified:
  owncloud/trunk/PKGBUILD
  owncloud/trunk/apache.example.conf

---------------------+
 PKGBUILD            |   25 +++++++++++++++----------
 apache.example.conf |    2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-13 20:00:42 UTC (rev 103943)
+++ PKGBUILD	2014-01-13 20:31:53 UTC (rev 103944)
@@ -6,7 +6,7 @@
 pkgname=owncloud
 pkgver=6.0.0.a
 _pkgver=6.0.0a
-pkgrel=2
+pkgrel=3
 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
 arch=('any')
 url="http://owncloud.org/"
@@ -23,23 +23,28 @@
 	    'libreoffice-common: file preview')
 makedepends=()
 options=('!strip')
-source=("http://download.owncloud.org/community/$pkgname-$_pkgver.tar.bz2"
+source=("http://download.owncloud.org/community/$pkgname-${_pkgver}.tar.bz2"{,.asc}
 	'apache.example.conf')
 backup=('etc/webapps/owncloud/apache.example.conf')
 md5sums=('63c2913aa8382f695d7ade5ad11e51b2'
-         'c1d49a3c0d8433bed6bffcd21ebb0064')
+         'SKIP'
+         '2c33ca1019379fa0878d5a1a87d9374d')
 
 package() {
   # install license
-  install -d $pkgdir/usr/share/licenses/$pkgname
-  cp $srcdir/$pkgname/COPYING-* $pkgdir/usr/share/licenses/$pkgname
+  install -d ${pkgdir}/usr/share/licenses/${pkgname}
+  cp ${srcdir}/${pkgname}/COPYING-* ${pkgdir}/usr/share/licenses/${pkgname}
 
   # install project
-  install -d $pkgdir/usr/share/webapps/
-  cp -a $srcdir/$pkgname $pkgdir/usr/share/webapps/
-  chown -R http:http $pkgdir/usr/share/webapps/owncloud/{apps,config}
+  install -d ${pkgdir}/usr/share/webapps/
+  cp -a ${srcdir}/${pkgname} ${pkgdir}/usr/share/webapps/
 
   # install apache config file
-  install -d  $pkgdir/etc/webapps/$pkgname
-  install -m 644 $srcdir/apache.example.conf  $pkgdir/etc/webapps/$pkgname
+  install -d  ${pkgdir}/etc/webapps/${pkgname}
+  install -m 644 ${srcdir}/apache.example.conf  ${pkgdir}/etc/webapps/${pkgname}
+
+  # move config to /etc
+  mv ${pkgdir}/usr/share/webapps/owncloud/config ${pkgdir}/etc/webapps/${pkgname}/config
+  chown -R http:http ${pkgdir}/etc/webapps/${pkgname}/config
+  ln -s /etc/webapps/${pkgname}/config ${pkgdir}/usr/share/webapps/owncloud/config
 }

Modified: apache.example.conf
===================================================================
--- apache.example.conf	2014-01-13 20:00:42 UTC (rev 103943)
+++ apache.example.conf	2014-01-13 20:31:53 UTC (rev 103944)
@@ -6,7 +6,7 @@
    Order allow,deny
    AllowOverride all
    allow from all
-   php_admin_value open_basedir "/srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/"
+   php_admin_value open_basedir "/srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/owncloud/:/etc/webapps/owncloud"
 </Directory>
 <VirtualHost *:80>
     ServerAdmin foo at foofarm.com