[lilac] updated to 2.19.0-3

7 files changed, 131 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3685310e4b06..e97430e368fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,27 @@
 pkgbase = filebrowser-bin
 	pkgdesc = Web File Manager which can be used as a middleware or standalone app.
 	pkgver = 2.19.0
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/filebrowser/filebrowser
 	install = filebrowser-bin.install
 	arch = x86_64
 	arch = aarch64
 	license = Apache
+	depends = glibc
 	provides = filebrowser
 	conflicts = filebrowser
+	backup = etc/filebrowser/filebrowser.conf
+	source = filebrowser.service
 	source = filebrowser@.service
 	source = filebrowser-bin.install
+	source = filebrowser.sysusers
+	source = filebrowser.tmpfiles
 	source = https://raw.githubusercontent.com/hacdias/filebrowser/master/LICENSE
-	sha256sums = 79a1fdb1f0b26f211242f1fdb6f3478a56890a721fe324ea7ade2e8f9a351b38
-	sha256sums = 8a423af0707ac37b15ca425ec097b3d98aecd08238f7599ae9dfcce31c8cbb32
+	sha256sums = 1d85acca4ca9bcdb6767ff60891d6e0a4e9c324fc50bed1231e8c891eb9c4420
+	sha256sums = 29031d87f8294889ea33658570422406ca8c13367ae20cbcc1f98132df83ea14
+	sha256sums = 4603bdfae5834b65443ed1e67d8be60011685d42b9e623a58209635ddd55ae12
+	sha256sums = 6246fbeac57750e146216892ed6eb1d43a995f987bb89ef12bcbfb3963f5aa2d
+	sha256sums = fd3da1de58e98185e0043070f55b46a86a78b9ebcdda949d0cd8a83e9b0b230c
 	sha256sums = 1fc20cab3a7d67d7997126a98dd151a362dc4600201ca37fd608b959d25985db
 	source_x86_64 = linux-amd64-filebrowser-2.19.0.tar.gz::https://github.com/filebrowser/filebrowser/releases/download/v2.19.0/linux-amd64-filebrowser.tar.gz
 	sha256sums_x86_64 = 549bf4f03c0de9ef27b0527900fafdd412e3fbaecb9fcdc8a1dbe357a06e05a8
diff --git a/PKGBUILD b/PKGBUILD
index 060b157fdb8f..a98664972f5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,39 @@
 # Contributor: Sherlock Holo <sherlockya(at)gmail.com>
 pkgname=filebrowser-bin
 pkgver=2.19.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Web File Manager which can be used as a middleware or standalone app."
 arch=('x86_64' 'aarch64')
 url="https://github.com/filebrowser/filebrowser"
 license=('Apache')
-#depends=('glibc')
+depends=('glibc')
 provides=("filebrowser")
 conflicts=("filebrowser")
+backup=("etc/filebrowser/filebrowser.conf")
 install="${pkgname}.install"
 
-source=('filebrowser@.service' 'filebrowser-bin.install'
+source=('filebrowser.service' 'filebrowser@.service' 'filebrowser-bin.install'
+        'filebrowser.sysusers' 'filebrowser.tmpfiles'
         'https://raw.githubusercontent.com/hacdias/filebrowser/master/LICENSE')
 source_x86_64=("linux-amd64-filebrowser-${pkgver}.tar.gz::https://github.com/filebrowser/filebrowser/releases/download/v${pkgver}/linux-amd64-filebrowser.tar.gz")
 source_aarch64=("linux-aarch64-filebrowser-${pkgver}.tar.gz::https://github.com/filebrowser/filebrowser/releases/download/v${pkgver}/linux-arm64-filebrowser.tar.gz")
 
-sha256sums=('79a1fdb1f0b26f211242f1fdb6f3478a56890a721fe324ea7ade2e8f9a351b38'
-            '8a423af0707ac37b15ca425ec097b3d98aecd08238f7599ae9dfcce31c8cbb32'
+sha256sums=('1d85acca4ca9bcdb6767ff60891d6e0a4e9c324fc50bed1231e8c891eb9c4420'
+            '29031d87f8294889ea33658570422406ca8c13367ae20cbcc1f98132df83ea14'
+            '4603bdfae5834b65443ed1e67d8be60011685d42b9e623a58209635ddd55ae12'
+            '6246fbeac57750e146216892ed6eb1d43a995f987bb89ef12bcbfb3963f5aa2d'
+            'fd3da1de58e98185e0043070f55b46a86a78b9ebcdda949d0cd8a83e9b0b230c'
             '1fc20cab3a7d67d7997126a98dd151a362dc4600201ca37fd608b959d25985db')
 sha256sums_x86_64=('549bf4f03c0de9ef27b0527900fafdd412e3fbaecb9fcdc8a1dbe357a06e05a8')
 sha256sums_aarch64=('67be1fd9c313521da359462ddf92d14d5b084d94d20ec0dc7942648d97705f00')
 
-
-
-
 package() {
-    install -Dm644 filebrowser@.service "${pkgdir}/usr/lib/systemd/system/filebrowser@.service"
-    install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/filebrowser-bin/LICENSE"
-    install -Dm755 "${srcdir}/filebrowser" "${pkgdir}/usr/bin/filebrowser"
+    install -Dm644 "${srcdir}/filebrowser.sysusers" "${pkgdir}/usr/lib/sysusers.d/filebrowser.conf"
+    install -Dm644 "${srcdir}/filebrowser.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/filebrowser.conf"
+    install -Dm644 "filebrowser.servic"e -t "${pkgdir}/usr/lib/systemd/system/"
+    install -Dm644 "filebrowser@.service" -t "${pkgdir}/usr/lib/systemd/system/"
+    install -Dm755 "LICENSE" -t "${pkgdir}/usr/share/licenses/filebrowser-bin/"
+    install -Dm755 "${srcdir}/filebrowser" -t "${pkgdir}/usr/bin/"
 }
 
 # vim set: ts=4 sw=4 et:
diff --git a/filebrowser-bin.install b/filebrowser-bin.install
index 831bc4983e29..2c6fa69bc3c8 100644
--- a/filebrowser-bin.install
+++ b/filebrowser-bin.install
@@ -1,34 +1,52 @@
 post_install() {
   echo "
 Welcome to the filebrowser!
-For the first time you need to initialize, for example:
-
 -----------------------------------------------------------------------------
-$ sudo mkdir -p /usr/share/filebrowser/storage
-$ cd /usr/share/filebrowser/storage
-$ sudo filebrowser config init
-...(Setting your filebrowser)
-$ sudo filebrowser config export /etc/filebrowser/config.json
-$ sudo systemctl enable --now filebrowser@config
+Default Config Path: /etc/filebrowser/
+Default Data Path: /var/lib/filebrowser/
+Default User & Group: filebrowser:filebrowser
+
+$ sudo su filebrowser
+$ cd /var/lib/filebrowser
+$ filebrowser config init
+$ filebrowser config export "/etc/filebrowser/filebrowser.json"
+$ filebrowser users add <admin username> <admin password> --perm.admin
+$ exit
+$ sudo systemctl start filebrowser.service
 -----------------------------------------------------------------------------
 
 More: https://github.com/filebrowser/filebrowser
-      https://docs.filebrowser.xyz/
+      https://filebrowser.org/
 "
 }
 
 post_upgrade() {
   echo "
 If you upgrade the filebrowser from 1.x
-You must need to read the: https://docs.filebrowser.xyz/upgrade-from-1.x
+You must need to read the: https://filebrowser.org/upgrade-from-1.x
 And the systemd unit and config file also need to be changed by yourself.
 
+For the version older than 2.19.0-2, you need to migrate the data and config to 
+the new directory "/var/lib/filebrowser/" with the new user and group: 'filebrowser'.
+
+-----------------------------------------------------------------------------
+Default Config Path: /etc/filebrowser/
+Default Data Path: /var/lib/filebrowser/
+Default User & Group: filebrowser:filebrowser
+-----------------------------------------------------------------------------
+
 More: https://github.com/filebrowser/filebrowser
-      https://docs.filebrowser.xyz/
+      https://filebrowser.org/
 "
 }
 
 post_remove() {
-  echo "You need to remove database and config by yourself."
+  echo "You need to remove database and config by yourself.
+-----------------------------------------------------------------------------
+Default Config Path: /etc/filebrowser/
+Default Data Path: /var/lib/filebrowser/
+Default User & Group: filebrowser:filebrowser
+-----------------------------------------------------------------------------  
+"
 }
 # vim: set ts=2 sw=2 et:
\ No newline at end of file
diff --git a/filebrowser.service b/filebrowser.service
new file mode 100644
index 000000000000..8b6eaa19d2e2
--- /dev/null
+++ b/filebrowser.service
@@ -0,0 +1,41 @@
+[Unit]
+Description=Filebrowser Service
+After=network.target
+Wants=network.target
+
+[Service]
+User=filebrowser
+Group=filebrowser
+Type=simple
+WorkingDirectory=/var/lib/filebrowser
+ConfigurationDirectory=filebrowser
+RuntimeDirectory=filebrowser
+LogsDirectory=filebrowser
+StateDirectory=filebrowser
+Environment=USER=filebrowser HOME=/var/lib/filebrowser
+ExecStart=/usr/bin/filebrowser --config /etc/filebrowser/filebrowser.json
+Restart=on-failure
+RestartSec=2s
+ReadWritePaths=/var/lib/filebrowser
+LockPersonality=true
+NoNewPrivileges=true
+PrivateDevices=true
+PrivateTmp=true
+PrivateUsers=true
+ProtectClock=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectProc=invisible
+ProtectSystem=strict
+RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX
+RestrictNamespaces=true
+RestrictRealtime=true
+RestrictSUIDSGID=true
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallErrorNumber=EPERM
+
+[Install]
+WantedBy=multi-user.target
diff --git a/filebrowser.sysusers b/filebrowser.sysusers
new file mode 100644
index 000000000000..3b5e2b126a61
--- /dev/null
+++ b/filebrowser.sysusers
@@ -0,0 +1 @@
+u filebrowser - "FileBrowser server" /var/lib/filebrowser /bin/bash
diff --git a/filebrowser.tmpfiles b/filebrowser.tmpfiles
new file mode 100644
index 000000000000..c759e91de7f2
--- /dev/null
+++ b/filebrowser.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/filebrowser 0750 filebrowser filebrowser -
+d /etc/filebrowser 0755 filebrowser filebrowser -
+z /etc/filebrowser/filebrowser.conf 0700 filebrowser filebrowser -
diff --git a/filebrowser@.service b/filebrowser@.service
index b4e22d776995..645439907e26 100644
--- a/filebrowser@.service
+++ b/filebrowser@.service
@@ -4,10 +4,38 @@ After=network.target
 Wants=network.target
 
 [Service]
+User=filebrowser
+Group=filebrowser
 Type=simple
-WorkingDirectory=/usr/share/filebrowser
+WorkingDirectory=/var/lib/filebrowser
+ConfigurationDirectory=filebrowser
+RuntimeDirectory=filebrowser
+LogsDirectory=filebrowser
+StateDirectory=filebrowser
+Environment=USER=filebrowser HOME=/var/lib/filebrowser
 ExecStart=/usr/bin/filebrowser --config /etc/filebrowser/%i.json
 Restart=on-failure
+RestartSec=2s
+ReadWritePaths=/var/lib/filebrowser
+LockPersonality=true
+NoNewPrivileges=true
+PrivateDevices=true
+PrivateTmp=true
+PrivateUsers=true
+ProtectClock=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectProc=invisible
+ProtectSystem=strict
+RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX
+RestrictNamespaces=true
+RestrictRealtime=true
+RestrictSUIDSGID=true
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallErrorNumber=EPERM
 
 [Install]
 WantedBy=multi-user.target