use php instead of occ

7 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08fe1c445376..8b8330ab0efa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nextcloud-systemd-timers
 	pkgdesc = Systemd services and timers for Nextcloud background jobs (see Nextcloud Arch Wiki entry).
-	pkgver = 0.6.3
+	pkgver = 0.7.0
 	pkgrel = 1
 	install = nextcloud-systemd-timers.install
 	arch = any
@@ -15,15 +15,15 @@ pkgbase = nextcloud-systemd-timers
 	source = nextcloud-preview-generate-all.timer
 	source = nextcloud-preview-pre-generate.service
 	source = nextcloud-preview-pre-generate.timer
-	sha256sums = ee6f44559dc7d378aa4e15800cc32fd4c21834c8eb3c22337e9cc93d99d7d96a
+	sha256sums = 231419498bda90a47a20927be414e126871877ddefb8234970942b75ce092349
 	sha256sums = 39039f1a3dc23022fccc991daca86d77e7d41be275566f6892cd6b290fa0da4a
 	sha256sums = 7fe27aa2ef2a034cf19a02571cefd1f6b40dd64fa48abda3ed0c82e2181f12c1
 	sha256sums = a7db3a28abfee48393bd70dc71e9abf813130169229f2a35b072cc11dbd09863
-	sha256sums = d81ebf8ad4a25293c0b7a80a4aa784848cfdc894eb9b799dd535bbb085713afd
+	sha256sums = a5bbae53fd6de8a7a2de7ff07e74ee8b709b1950e6a4d817e80550ad9da8c65e
 	sha256sums = 2f191059b619141ba883ae132af56460212c84eb208f087b87b79b0a3b9e4900
-	sha256sums = 18913873bf889f8b4d8bc2109d313fed02e523c86519ca96285640bf965732d5
+	sha256sums = 73c33917bb69889efecd9c47fe4f99910419e7cfdeea012f68d9f4b73dc74cb8
 	sha256sums = bd4bbd01a9d68e0217c3b48c977dda881fd956b53f981a6e32af0357d2e0b716
-	sha256sums = bfaa2602d78f097c95e76d150423f83779384a737d41502bd8067b8f663b436f
+	sha256sums = 98ec0f1a78738d2aa2497b8b01faad4b9e9c44f90988ef3e592257dd2eef9bc8
 	sha256sums = 56e3cab181040101be05d4b7723825f7b0c082c34403e42c6f0934c6474a6a43
 
 pkgname = nextcloud-systemd-timers
diff --git a/PKGBUILD b/PKGBUILD
index 5cde72254315..5f917f174868 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dominik Schrempf <dominik.schrempf@gmail.com>
 pkgname=nextcloud-systemd-timers
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 epoch=
 pkgdesc="Systemd services and timers for Nextcloud background jobs (see Nextcloud Arch Wiki entry)."
@@ -29,15 +29,15 @@ source=("nextcloud-app-update-all.service"
         "nextcloud-preview-generate-all.timer"
         "nextcloud-preview-pre-generate.service"
         "nextcloud-preview-pre-generate.timer")
-sha256sums=('ee6f44559dc7d378aa4e15800cc32fd4c21834c8eb3c22337e9cc93d99d7d96a'
+sha256sums=('231419498bda90a47a20927be414e126871877ddefb8234970942b75ce092349'
             '39039f1a3dc23022fccc991daca86d77e7d41be275566f6892cd6b290fa0da4a'
             '7fe27aa2ef2a034cf19a02571cefd1f6b40dd64fa48abda3ed0c82e2181f12c1'
             'a7db3a28abfee48393bd70dc71e9abf813130169229f2a35b072cc11dbd09863'
-            'd81ebf8ad4a25293c0b7a80a4aa784848cfdc894eb9b799dd535bbb085713afd'
+            'a5bbae53fd6de8a7a2de7ff07e74ee8b709b1950e6a4d817e80550ad9da8c65e'
             '2f191059b619141ba883ae132af56460212c84eb208f087b87b79b0a3b9e4900'
-            '18913873bf889f8b4d8bc2109d313fed02e523c86519ca96285640bf965732d5'
+            '73c33917bb69889efecd9c47fe4f99910419e7cfdeea012f68d9f4b73dc74cb8'
             'bd4bbd01a9d68e0217c3b48c977dda881fd956b53f981a6e32af0357d2e0b716'
-            'bfaa2602d78f097c95e76d150423f83779384a737d41502bd8067b8f663b436f'
+            '98ec0f1a78738d2aa2497b8b01faad4b9e9c44f90988ef3e592257dd2eef9bc8'
             '56e3cab181040101be05d4b7723825f7b0c082c34403e42c6f0934c6474a6a43')
 noextract=()
 
diff --git a/nextcloud-app-update-all.service b/nextcloud-app-update-all.service
index 48ec146c9e54..a757596dc088 100644
--- a/nextcloud-app-update-all.service
+++ b/nextcloud-app-update-all.service
@@ -3,7 +3,7 @@ Description=Nextcloud; update all applications
 
 [Service]
 User=http
-ExecStart=/usr/share/webapps/nextcloud/occ app:update --all
+ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ app:update --all
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-files-scan-all.service b/nextcloud-files-scan-all.service
index 74894f247064..639dda1cf902 100644
--- a/nextcloud-files-scan-all.service
+++ b/nextcloud-files-scan-all.service
@@ -3,7 +3,7 @@ Description=Nextcloud; scan all files
 
 [Service]
 User=http
-ExecStart=/usr/share/webapps/nextcloud/occ files:scan --all
+ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ files:scan --all
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-preview-generate-all.service b/nextcloud-preview-generate-all.service
index b18c0be410df..9fe73368a39f 100644
--- a/nextcloud-preview-generate-all.service
+++ b/nextcloud-preview-generate-all.service
@@ -3,7 +3,7 @@ Description=Nextcloud; generate previews for all files
 
 [Service]
 User=http
-ExecStart=/usr/share/webapps/nextcloud/occ preview:generate-all
+ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ preview:generate-all
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-preview-pre-generate.service b/nextcloud-preview-pre-generate.service
index cf39f37ff77e..bf4eebb26c6e 100644
--- a/nextcloud-preview-pre-generate.service
+++ b/nextcloud-preview-pre-generate.service
@@ -3,7 +3,7 @@ Description=Nextcloud; generate previews for new files only
 
 [Service]
 User=http
-ExecStart=/usr/share/webapps/nextcloud/occ preview:pre-generate
+ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ preview:pre-generate
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-systemd-timers.install b/nextcloud-systemd-timers.install
index 144cebdd4b15..6ac53697c903 100644
--- a/nextcloud-systemd-timers.install
+++ b/nextcloud-systemd-timers.install
@@ -48,6 +48,11 @@ pre_upgrade() {
         echo "- nextcloud-app-update-all.timer"
         echo "      Periodic (daily) update all applications."
         echo
+    elif [[ "$1" == "0.7.0-1" ]]
+    then
+        echo
+        echo "The php executable is used now in order to reduce the permissions given"
+        echo "to the occ executable. Please verify that the jobs execute correctly."
     fi
 }