Updated to v2.0.2.10. System duplicati.service no longer runs as root.

4 files changed, 33 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8f9bf479e30..76367e259036 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Sep 20 15:44:28 UTC 2017
+# Thu Oct 19 16:20:31 UTC 2017
 pkgbase = duplicati-latest
 	pkgdesc = A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers
-	pkgver = 2.0.2.8
+	pkgver = 2.0.2.10
 	pkgrel = 1
 	url = http://duplicati.com
 	install = duplicati.install
@@ -11,12 +11,14 @@ pkgbase = duplicati-latest
 	license = LGPL
 	depends = gtk-sharp-2
 	depends = mono
-	source = https://github.com/duplicati/duplicati/releases/download/v2.0.2.8-2.0.2.8_canary_2017-09-20/duplicati-2.0.2.8_canary_2017-09-20.zip
+	source = https://github.com/duplicati/duplicati/releases/download/v2.0.2.10-2.0.2.10_canary_2017-10-11/duplicati-2.0.2.10_canary_2017-10-11.zip
 	source = duplicati-user.service
 	source = duplicati.service
-	sha256sums = 1740c8327e8d67a82a0d5b66ff2e6912fa95bf420790e105b20d6afc4028ae8c
+	source = duplicati.sysusers
+	sha256sums = abb916b9f57c5effa3153d81462455a56d514e77c5d46ed4d1ab435234160ae1
 	sha256sums = ec25b25d0e331ddfb90940555068aa941c3d5dfaf858cffb6c75e810175c9d27
 	sha256sums = bca921cfddd95c951aceb796572eb51ce6df437c6f05660333c47be726573438
+	sha256sums = b9389b399467f3e02aa8e76bb98f6efbca1166fbc4d0bdf939493f8403462959
 
 pkgname = duplicati-latest
 
diff --git a/PKGBUILD b/PKGBUILD
index 7af25ea9ef59..41fd6f6dc1c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Danny Su       <contact@dannysu.com>
 
 pkgname=duplicati-latest
-pkgver=2.0.2.8
+pkgver=2.0.2.10
 pkgrel=1
-_date=2017-09-20
+_date=2017-10-11
 _branch=canary
 pkgdesc='A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers'
 url='http://duplicati.com'
@@ -13,10 +13,12 @@ license=('LGPL')
 install=duplicati.install
 source=(https://github.com/duplicati/duplicati/releases/download/v${pkgver}-${pkgver}_${_branch}_${_date}/duplicati-${pkgver}_${_branch}_${_date}.zip
 	duplicati-user.service
-	duplicati.service)
-sha256sums=('1740c8327e8d67a82a0d5b66ff2e6912fa95bf420790e105b20d6afc4028ae8c'
+	duplicati.service
+	duplicati.sysusers)
+sha256sums=('abb916b9f57c5effa3153d81462455a56d514e77c5d46ed4d1ab435234160ae1'
             'ec25b25d0e331ddfb90940555068aa941c3d5dfaf858cffb6c75e810175c9d27'
-            'bca921cfddd95c951aceb796572eb51ce6df437c6f05660333c47be726573438')
+            'bca921cfddd95c951aceb796572eb51ce6df437c6f05660333c47be726573438'
+            'b9389b399467f3e02aa8e76bb98f6efbca1166fbc4d0bdf939493f8403462959')
 arch=('i686' 'x86_64')
 depends=('gtk-sharp-2' 'mono')
 
@@ -24,6 +26,7 @@ package() {
   # Install the service.
   install -Dm644 duplicati.service  "${pkgdir}/usr/lib/systemd/system/duplicati.service"
   install -Dm644 duplicati-user.service  "${pkgdir}/usr/lib/systemd/user/duplicati.service"
+  install -Dm644 "$srcdir/duplicati.sysusers" "$pkgdir/usr/lib/sysusers.d/duplicati.conf"
   rm duplicati.service duplicati-user.service
 
   # Install the program.
diff --git a/duplicati.install b/duplicati.install
index afd9cceb0489..ce4223a18830 100644
--- a/duplicati.install
+++ b/duplicati.install
@@ -3,7 +3,25 @@ post_install() {
 }
 
 post_upgrade() {
+  systemd-sysusers duplicati.conf
+  mkdir -p /var/lib/duplicati
+  chown -R duplicati:duplicati /var/lib/duplicati
 
+if [ $(vercmp $2 2.0.2.10-1) -lt 0 ]; then
+cat << EOF
+  * In versions prior to 2.0.2.10-1, the system version of duplicati.service
+  * started Duplicati.Server.exe as root. It now runs as user duplicati.
+  * Please move your old duplicati database from
+  *    /root/.config/Duplicati
+  * to
+  *    /var/lib/duplicati/.config/Duplicati
+  * To run Duplicati.Server.exe as root, simply use systemd's "drop-in" feature
+  * and specify
+  *    User=root
+  *    Group=root
+EOF
+fi
+  
 cat << EOF
   * UI can be accessed via following URL: http://localhost:8200
   * Running duplicati user instance (using current user account)
diff --git a/duplicati.sysusers b/duplicati.sysusers
new file mode 100644
index 000000000000..255522fde414
--- /dev/null
+++ b/duplicati.sysusers
@@ -0,0 +1 @@
+u duplicati - "Duplicati daemon" /var/lib/duplicati
\ No newline at end of file