summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schrempf2018-11-28 10:23:53 +0100
committerDominik Schrempf2018-11-28 10:23:53 +0100
commitb03e249923569fe28e279c457cc4268b8300482e (patch)
tree54d91fff7f57e14dd77d1c5de76b0c0e6b7294df
parent2246da19cf4397a856e83b97e17ac6641b0fe1ee (diff)
downloadaur-b03e249923569fe28e279c457cc4268b8300482e.tar.gz
Rename package, include file scan timer.
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD30
-rw-r--r--nextcloud-cron.service (renamed from nextcloudcron.service)0
-rw-r--r--nextcloud-cron.timer (renamed from nextcloudcron.timer)1
-rw-r--r--nextcloud-filescan.service9
-rw-r--r--nextcloud-filescan.timer10
-rw-r--r--nextcloud-preview.timer5
-rw-r--r--nextcloud-systemd-timers.install (renamed from nextcloud-systemd-cron.install)0
8 files changed, 53 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3390f66adf..3f99794cfcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,23 @@
-pkgbase = nextcloud-systemd-cron
- pkgdesc = Systemd service and timer for Nextcloud Cron background jobs (see Nextcloud Arch Wiki entry).
- pkgver = 0.3
+pkgbase = nextcloud-systemd-timers
+ pkgdesc = Systemd services and timers for Nextcloud background jobs (see Nextcloud Arch Wiki entry).
+ pkgver = 0.4
pkgrel = 1
- install = nextcloud-systemd-cron.install
+ install = nextcloud-systemd-timers.install
arch = any
license = GPL
- source = nextcloudcron.service
- source = nextcloudcron.timer
+ conflicts = nextcloud-systemd-cron
+ source = nextcloud-cron.service
+ source = nextcloud-cron.timer
source = nextcloud-preview.service
source = nextcloud-preview.timer
+ source = nextcloud-filescan.service
+ source = nextcloud-filescan.timer
md5sums = 78dbe72845222ad01aafb60f32f828e8
- md5sums = c8fabd54720ad97c472a842a1d91f5b1
+ md5sums = fff77f3c2c11c5928470cd0816ec4b4e
md5sums = a019ced938dc5a6c1cc59e05c5a88be3
- md5sums = 435d1a3537471163e3cc1c304e4fae76
+ md5sums = a9cbb757ac34fcf636653086afd581d5
+ md5sums = ca8393b6ddb3cc4d23cef10ec02bc271
+ md5sums = 6860cf4c5b712c37a1f942d661256107
-pkgname = nextcloud-systemd-cron
+pkgname = nextcloud-systemd-timers
diff --git a/PKGBUILD b/PKGBUILD
index 30048f03fec..cdb0ada8c49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Dominik Schrempf <dominik.schrempf@gmail.com>
-pkgname=nextcloud-systemd-cron
-pkgver=0.3
+pkgname=nextcloud-systemd-timers
+pkgver=0.4
pkgrel=1
epoch=
-pkgdesc="Systemd service and timer for Nextcloud Cron background jobs (see Nextcloud Arch Wiki entry)."
+pkgdesc="Systemd services and timers for Nextcloud background jobs (see Nextcloud Arch Wiki entry)."
arch=('any')
url=""
license=('GPL')
@@ -13,20 +13,24 @@ makedepends=()
checkdepends=()
optdepends=()
provides=()
-conflicts=()
+conflicts=(nextcloud-systemd-cron)
replaces=()
backup=()
options=()
-install=nextcloud-systemd-cron.install
+install=nextcloud-systemd-timers.install
changelog=
-source=("nextcloudcron.service"
- "nextcloudcron.timer"
+source=("nextcloud-cron.service"
+ "nextcloud-cron.timer"
"nextcloud-preview.service"
- "nextcloud-preview.timer")
+ "nextcloud-preview.timer"
+ "nextcloud-filescan.service"
+ "nextcloud-filescan.timer")
md5sums=('78dbe72845222ad01aafb60f32f828e8'
- 'c8fabd54720ad97c472a842a1d91f5b1'
+ 'fff77f3c2c11c5928470cd0816ec4b4e'
'a019ced938dc5a6c1cc59e05c5a88be3'
- '435d1a3537471163e3cc1c304e4fae76')
+ 'a9cbb757ac34fcf636653086afd581d5'
+ 'ca8393b6ddb3cc4d23cef10ec02bc271'
+ '6860cf4c5b712c37a1f942d661256107')
noextract=()
# prepare() {
@@ -48,10 +52,12 @@ noextract=()
package() {
# cd "$srcdir/$pkgname-$pkgver"
# make DESTDIR="$pkgdir/" install
- install -D -m 644 nextcloudcron.service $pkgdir/etc/systemd/system/nextcloudcron.service
- install -D -m 644 nextcloudcron.timer $pkgdir/etc/systemd/system/nextcloudcron.timer
+ install -D -m 644 nextcloud-cron.service $pkgdir/etc/systemd/system/nextcloud-cron.service
+ install -D -m 644 nextcloud-cron.timer $pkgdir/etc/systemd/system/nextcloud-cron.timer
install -D -m 644 nextcloud-preview.service $pkgdir/etc/systemd/system/nextcloud-preview.service
install -D -m 644 nextcloud-preview.timer $pkgdir/etc/systemd/system/nextcloud-preview.timer
+ install -D -m 644 nextcloud-filescan.service $pkgdir/etc/systemd/system/nextcloud-filescan.service
+ install -D -m 644 nextcloud-filescan.timer $pkgdir/etc/systemd/system/nextcloud-filescan.timer
}
# vim:set ts=2 sw=2 et:
diff --git a/nextcloudcron.service b/nextcloud-cron.service
index 63cf94de310..63cf94de310 100644
--- a/nextcloudcron.service
+++ b/nextcloud-cron.service
diff --git a/nextcloudcron.timer b/nextcloud-cron.timer
index a53a4af21ce..4b8bc606e34 100644
--- a/nextcloudcron.timer
+++ b/nextcloud-cron.timer
@@ -4,7 +4,6 @@ Description=Nextcloud cron.php
[Timer]
OnBootSec=5min
OnUnitActiveSec=15min
-Unit=nextcloudcron.service
[Install]
WantedBy=timers.target \ No newline at end of file
diff --git a/nextcloud-filescan.service b/nextcloud-filescan.service
new file mode 100644
index 00000000000..ee13b0c6bdc
--- /dev/null
+++ b/nextcloud-filescan.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Nextcloud file scan
+
+[Service]
+User=http
+ExecStart=/usr/share/webapps/nextcloud/occ files:scan
+
+[Install]
+WantedBy=basic.target
diff --git a/nextcloud-filescan.timer b/nextcloud-filescan.timer
new file mode 100644
index 00000000000..e5920f075b0
--- /dev/null
+++ b/nextcloud-filescan.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Nextcloud file scan
+
+[Timer]
+OnBootSec=15min
+OnCalendar=weekly
+Persistent=True
+
+[Install]
+WantedBy=timers.target \ No newline at end of file
diff --git a/nextcloud-preview.timer b/nextcloud-preview.timer
index 89a971e43ab..f906d54fdf7 100644
--- a/nextcloud-preview.timer
+++ b/nextcloud-preview.timer
@@ -2,9 +2,8 @@
Description=Nextcloud preview generation
[Timer]
-OnBootSec=5min
-OnCalendar=weekly
-Persistent=True
+OnBootSec=10min
+OnUnitActiveSec=15min
[Install]
WantedBy=timers.target \ No newline at end of file
diff --git a/nextcloud-systemd-cron.install b/nextcloud-systemd-timers.install
index 3650ae45389..3650ae45389 100644
--- a/nextcloud-systemd-cron.install
+++ b/nextcloud-systemd-timers.install