summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--defaults.yml1
-rw-r--r--options.yml2
-rw-r--r--photoprism.service2
5 files changed, 11 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d04fbe47ec38..40d8852e676c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = photoprism
pkgdesc = Personal Photo Management powered by Go and Google TensorFlow
pkgver = 221118
- pkgrel = 0
+ pkgrel = 1
url = https://github.com/photoprism/photoprism
arch = x86_64
arch = aarch64
@@ -26,15 +26,15 @@ pkgbase = photoprism
source = https://dl.photoprism.org/tensorflow/nsfw.zip
source = photoprism.service
source = photoprism.sysusers
- source = options.yml
+ source = defaults.yml
source = photoprism.tmpfiles
sha256sums = SKIP
sha256sums = a0e1ad8d5a5a0ff9efc4b3ed89898bf008563ee36cacd0c804a384f8fc661588
sha256sums = bf9ae0945d2ac53ac3db27082162d2b9dda5ba2c564c0e4c4f539f31f8b670af
sha256sums = eb5e5d22e37961c3192a4757efff883f77bc989c0efceabb1395e0959d966f14
- sha256sums = 54bd008dc089cb29a1bef22a2509bbf493af387104725193595b67d82c5e2b9d
+ sha256sums = 18fb59d0ee09f6b9d95666e8c6fdd1b151fae985c18befb11b86e0fc1884b7d7
sha256sums = 73afd3b2983d6a31405c5a68f553f1a82a87a0d38483cdb56e32e959840ad1a6
- sha256sums = 3921b7516182b82a41672b3894ff998ce78b19d39c87b76a8db2894b01145287
+ sha256sums = f1242a6208a2623815d585d089fa133664dc3ddf5f63b468093da059141fb523
sha256sums = ec6f438c9818f982fb2aaa1895a8b07abb41a3c2befd1c3baa2fecbc2d6cc721
pkgname = photoprism
diff --git a/PKGBUILD b/PKGBUILD
index 101d156e08d1..cd6551f6d72e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=photoprism
pkgver="221118"
commit="e58fee0fb"
-pkgrel=0
+pkgrel=1
epoch=
pkgdesc="Personal Photo Management powered by Go and Google TensorFlow "
arch=(x86_64 aarch64)
@@ -33,15 +33,15 @@ source=("git+https://github.com/photoprism/photoprism.git#tag=${pkgver}-${commit
"https://dl.photoprism.org/tensorflow/nsfw.zip"
"photoprism.service"
"photoprism.sysusers"
- "options.yml"
+ "defaults.yml"
"photoprism.tmpfiles")
sha256sums=('SKIP'
'a0e1ad8d5a5a0ff9efc4b3ed89898bf008563ee36cacd0c804a384f8fc661588'
'bf9ae0945d2ac53ac3db27082162d2b9dda5ba2c564c0e4c4f539f31f8b670af'
'eb5e5d22e37961c3192a4757efff883f77bc989c0efceabb1395e0959d966f14'
- '54bd008dc089cb29a1bef22a2509bbf493af387104725193595b67d82c5e2b9d'
+ '18fb59d0ee09f6b9d95666e8c6fdd1b151fae985c18befb11b86e0fc1884b7d7'
'73afd3b2983d6a31405c5a68f553f1a82a87a0d38483cdb56e32e959840ad1a6'
- '3921b7516182b82a41672b3894ff998ce78b19d39c87b76a8db2894b01145287'
+ 'f1242a6208a2623815d585d089fa133664dc3ddf5f63b468093da059141fb523'
'ec6f438c9818f982fb2aaa1895a8b07abb41a3c2befd1c3baa2fecbc2d6cc721')
noextract=()
validpgpkeys=()
@@ -65,7 +65,7 @@ package() {
install -Dm 0644 "${srcdir}/photoprism.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/photoprism.conf"
mkdir -p "$pkgdir/etc/photoprism"
- install -Dm 0444 "${srcdir}/options.yml" "$pkgdir/etc/photoprism/options.yml"
+ install -Dm 0444 "${srcdir}/defaults.yml" "$pkgdir/etc/photoprism/defaults.yml"
mkdir -p "$pkgdir/var/lib/photoprism/assets/"
diff --git a/defaults.yml b/defaults.yml
new file mode 100644
index 000000000000..2b7dcb0d1244
--- /dev/null
+++ b/defaults.yml
@@ -0,0 +1 @@
+ConfigPath: /etc/photoprism
diff --git a/options.yml b/options.yml
deleted file mode 100644
index e578d5d327ee..000000000000
--- a/options.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-ConfigPath: /etc/photoprism
-AssetsPath: /var/lib/photoprism/assets
diff --git a/photoprism.service b/photoprism.service
index 605f2c201471..2cf8c54ca450 100644
--- a/photoprism.service
+++ b/photoprism.service
@@ -10,7 +10,7 @@ Description=Photoprism
WantedBy=multi-user.target
[Service]
-ExecStart=/usr/bin/photoprism --defaults-yaml=/etc/photoprism/options.yml start
+ExecStart=/usr/bin/photoprism start
Restart=always
RestartSec=10