summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin2015-03-30 11:27:57 +0200
committerFlorian Bruhin2015-03-30 11:27:57 +0200
commitd988913841f9a9f89ed9386833a210d9f80b4281 (patch)
tree2a97340834e6c174108555ed26560fe5da2c711d
parent845737022f530d6a389531d5ddc9d63f0517624d (diff)
downloadaur-d988913841f9a9f89ed9386833a210d9f80b4281.tar.gz
Clean up agendav.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD74
-rw-r--r--apache.example.conf7
-rw-r--r--nginx.example.conf17
4 files changed, 59 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ce0b37e003..5dd5e3704a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = agendav
pkgdesc = Open source multilanguage CalDAV web client
pkgver = 1.2.6.2
- pkgrel = 1
+ pkgrel = 2
url = http://agendav.org/
install = agendav.install
arch = any
@@ -11,7 +11,11 @@ pkgbase = agendav
backup = etc/webapps/agendav/caldav.php
backup = etc/webapps/agendav/database.php
source = agendav-1.2.6.2.tar.gz::https://github.com/adobo/agendav/archive/1.2.6.2.tar.gz
- md5sums = 27269ed9aabbd3491061e3fc2541917c
+ source = nginx.example.conf
+ source = apache.example.conf
+ sha1sums = 621a7fbb8909b4852ffa7e53dab086ca314d3cae
+ sha1sums = 8c2b1b02c09db5518cdccefd940094535957c3a7
+ sha1sums = c742ec9ca86af8c984a3124db59004b30fd424a9
pkgname = agendav
diff --git a/PKGBUILD b/PKGBUILD
index 48849b5d322..639421675a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=agendav
pkgver=1.2.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="Open source multilanguage CalDAV web client"
arch=(any)
url="http://agendav.org/"
@@ -12,58 +12,42 @@ depends=('php')
backup=("etc/webapps/agendav/config.php"
"etc/webapps/agendav/caldav.php"
"etc/webapps/agendav/database.php")
-source=($pkgname-$pkgver.tar.gz::https://github.com/adobo/${pkgname}/archive/${pkgver}.tar.gz)
+source=($pkgname-$pkgver.tar.gz::https://github.com/adobo/${pkgname}/archive/${pkgver}.tar.gz
+ nginx.example.conf
+ apache.example.conf)
install=$pkgname.install
-md5sums=('27269ed9aabbd3491061e3fc2541917c')
-
-build() {
- true
-}
+sha1sums=('621a7fbb8909b4852ffa7e53dab086ca314d3cae'
+ '8c2b1b02c09db5518cdccefd940094535957c3a7'
+ 'c742ec9ca86af8c984a3124db59004b30fd424a9')
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- mkdir -p ${pkgdir}/etc/webapps/agendav
-
- install -D -m644 web/config/config.php.template ${pkgdir}/usr/share/webapps/agendav/web/config/config.php
- install -D -m644 web/config/caldav.php.template ${pkgdir}/usr/share/webapps/agendav/web/config/caldav.php
- install -D -m644 web/config/database.php.template ${pkgdir}/usr/share/webapps/agendav/web/config/database.php
-
- ln -s /usr/share/webapps/agendav/web/config/config.php ${pkgdir}/etc/webapps/agendav/config.php
- ln -s /usr/share/webapps/agendav/web/config/caldav.php ${pkgdir}/etc/webapps/agendav/caldav.php
- ln -s /usr/share/webapps/agendav/web/config/database.php ${pkgdir}/etc/webapps/agendav/database.php
+ cd "$srcdir/$pkgname-$pkgver"
- cat > ${pkgdir}/etc/webapps/agendav/nginx.example.conf <<EOF
- server {
- listen 80;
- server_name localhost;
+ mkdir -p "${pkgdir}/etc/webapps/agendav"
- root /usr/share/webapps/agendav/web/public;
+ install -Dm644 web/config/config.php.template \
+ "${pkgdir}/usr/share/webapps/agendav/web/config/config.php"
+ install -Dm644 web/config/caldav.php.template \
+ "${pkgdir}/usr/share/webapps/agendav/web/config/caldav.php"
+ install -Dm644 web/config/database.php.template \
+ "${pkgdir}/usr/share/webapps/agendav/web/config/database.php"
- location ~\.php$ {
- try_files $uri = 404;
- fastcgi_pass unix::/run/php-fpm/php-fpm.sock;
- fastcgi_index index.php;
- include fastcgi.conf;
- }
+ ln -s /usr/share/webapps/agendav/web/config/config.php \
+ "${pkgdir}/etc/webapps/agendav/config.php"
+ ln -s /usr/share/webapps/agendav/web/config/caldav.php \
+ "${pkgdir}/etc/webapps/agendav/caldav.php"
+ ln -s /usr/share/webapps/agendav/web/config/database.php \
+ "${pkgdir}/etc/webapps/agendav/database.php"
- location / {
- try_files $uri $uri/ /index.php;
- }
-EOF
+ install -Dm644 "$srcdir/nginx.example.conf" \
+ "$pkgdir/etc/webapps/agendav/nginx.example.conf"
- cat > ${pkgdir}/etc/webapps/agendav/apache.example.conf <<EOF
- Alias /agendav "/usr/share/webapps/agendav/web/public"
- <Directory "/usr/share/webapps/agendav">
- Options FollowSymlinks
- AllowOverride All
- Order allow,deny
- Allow from all
- </Directory>
-EOF
+ install -Dm644 "$srcdir/apache.example.conf" \
+ "$pkgdir/etc/webapps/agendav/apache.example.conf"
- find . -type f -exec install -D -m644 {,${pkgdir}/usr/share/webapps/agendav/}{} \;
+ find . -type f -exec \
+ install -D -m644 {,"${pkgdir}/usr/share/webapps/agendav/"}{} \;
- cd ${pkgdir}/usr/share/webapps/agendav/web/application
- ln -s ../config ./config
+ ln -s ../config \
+ "${pkgdir}/usr/share/webapps/agendav/web/application/config"
}
diff --git a/apache.example.conf b/apache.example.conf
new file mode 100644
index 00000000000..b4496435a6a
--- /dev/null
+++ b/apache.example.conf
@@ -0,0 +1,7 @@
+Alias /agendav "/usr/share/webapps/agendav/web/public"
+<Directory "/usr/share/webapps/agendav">
+ Options FollowSymlinks
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+</Directory>
diff --git a/nginx.example.conf b/nginx.example.conf
new file mode 100644
index 00000000000..9e8d372a6a2
--- /dev/null
+++ b/nginx.example.conf
@@ -0,0 +1,17 @@
+server {
+ listen 80;
+ server_name localhost;
+
+ root /usr/share/webapps/agendav/web/public;
+
+ location ~\.php$ {
+ try_files $uri = 404;
+ fastcgi_pass unix::/run/php-fpm/php-fpm.sock;
+ fastcgi_index index.php;
+ include fastcgi.conf;
+ }
+
+ location / {
+ try_files $uri $uri/ /index.php;
+ }
+}