summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2015-07-07 16:53:28 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2015-07-07 16:53:28 -0500
commitdec66742c02103fb8060b7c80c1ecf54319440ec (patch)
treeda1b32ebf1c59ac1ff0b9bc71ce8bf0cfe0dae74
parentdd2f6e7973a8093bf0b464aa486bf3b00134e65f (diff)
radicale-0.10-1: updating version
-rw-r--r--pcr/radicale/PKGBUILD39
-rw-r--r--pcr/radicale/radicale.install22
-rw-r--r--pcr/radicale/radicale.service12
3 files changed, 46 insertions, 27 deletions
diff --git a/pcr/radicale/PKGBUILD b/pcr/radicale/PKGBUILD
index 5244a63ab..f11a2e9c6 100644
--- a/pcr/radicale/PKGBUILD
+++ b/pcr/radicale/PKGBUILD
@@ -1,25 +1,38 @@
-# Maintainer (Arch): Guillaume Bouchard <guillaume.bouchard@liris.cnrs.fr>
+# Maintainer (Arch): Moritz Lipp <mlq@pwmt.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
pkgname=radicale
-pkgver=0.8
+pkgver=0.10
pkgrel=1
pkgdesc="A Simple Calendar Server"
arch=any
url="http://www.radicale.org/"
license=('GPL3')
-depends=('python2')
+depends=('python>=3.2')
backup=('etc/radicale/config')
-source=(http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz
- radicale.service)
-install=radicale.install
+install='radicale.install'
+source=(
+ http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz
+ radicale.service
+ radicale.install
+)
+md5sums=('32655d8893962956ead0ad690cca6044'
+ '62af2e07ad32a0fcece32fae68e92daf'
+ '5613eec93efc5ef2ef68abd124fb6b61')
+optdepends=(
+ 'python-pam: For PAM authentication'
+ 'python-requests: For HTTP authentication'
+ 'python-ldap: For LDAP authentication'
+ )
package() {
cd "$srcdir/Radicale-$pkgver"
- python2 setup.py install --prefix=/usr --root="$pkgdir"
+ python setup.py install --prefix=/usr --root="$pkgdir"
- install -D "$srcdir/Radicale-$pkgver/config" "$pkgdir/etc/radicale/config"
- install -m744 -D "$srcdir/radicale.service" "$pkgdir/usr/lib/systemd/system/radicale.service"
+ install -m644 -D "$srcdir/Radicale-$pkgver/config" "$pkgdir/etc/radicale/config"
+ install -m644 -D "$srcdir/radicale.service" "$pkgdir/usr/lib/systemd/system/radicale.service"
+
+ install -m644 -D "$srcdir/Radicale-$pkgver/radicale.fcgi" \
+ "$pkgdir/usr/share/$pkgname/radicale.fcgi"
+ install -m644 -D "$srcdir/Radicale-$pkgver/radicale.wsgi" \
+ "$pkgdir/usr/share/$pkgname/radicale.wsgi"
}
-sha1sums=('05e07d8ff851d15bcdb7274680ee3aceeebe01c3'
- 'c8ef31d70828b302ad709d7db5557c05283efb47')
-sha256sums=('e8c0df5239c22f2687a09eca7d53c318706648aff72b620849ed3f7540bc1941'
- '8a56209f42de337a5bd12f9ce4de1719228dbeba9743e9ec454af3685a03b764')
diff --git a/pcr/radicale/radicale.install b/pcr/radicale/radicale.install
index 2bd33ed49..720dc55f1 100644
--- a/pcr/radicale/radicale.install
+++ b/pcr/radicale/radicale.install
@@ -1,10 +1,16 @@
post_install() {
- useradd --create-home \
- --home-dir /srv/cal \
- --user-group \
- --system \
- --comment "Radicale" \
- --skel /dev/null \
- --shell /usr/bin/nologin \
- cal
+ getent group radicale &>/dev/null || groupadd radicale >/dev/null
+ getent passwd radicale &>/dev/null || useradd -r -s /usr/bin/false \
+ -g radicale -G radicale,http -d /etc/radicale/ radicale >/dev/null
+ chown -R radicale:radicale /etc/radicale/
+}
+
+post_update() {
+ chown -R radicale:radicale /etc/radicale/
+}
+
+pre_remove() {
+ getent passwd radicale &>/dev/null && userdel radicale >/dev/null
+ getent group radicale &>/dev/null && groupdel radicale >/dev/null
+ true
}
diff --git a/pcr/radicale/radicale.service b/pcr/radicale/radicale.service
index a159b772e..490904d7b 100644
--- a/pcr/radicale/radicale.service
+++ b/pcr/radicale/radicale.service
@@ -1,12 +1,12 @@
[Unit]
-Description=Radicale caldav server
-After=network.target
+Description=RadiCAL Server
+After=syslog.target network.target
[Service]
-ExecStart=/usr/bin/radicale
-ExecStop=/bin/kill -HUP $MAINPID
-User=cal
-Group=cal
+Type=simple
+ExecStart=/usr/bin/radicale -f
+User=radicale
+Group=radicale
[Install]
WantedBy=multi-user.target