update to O.8.O

4 files changed, 62 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6592e67f052..e114fe1a27bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
 pkgbase = standardfile-bin
 	pkgdesc = Standard File Server, Go Implementation
-	pkgver = 0.5.0
+	pkgver = 0.8.0
 	pkgrel = 1
 	url = https://github.com/tectiv3/standardfile
-	arch = i686
 	arch = x86_64
-	arch = armv6h
-	arch = armv7h
 	arch = aarch64
 	license = MIT
 	depends = glibc
@@ -14,21 +11,16 @@ pkgbase = standardfile-bin
 	source = standardfile.service
 	source = standardfile.sysusers
 	source = standardfile.tmpfiles
+	source = standardfile.example.yaml
 	source = standardfile.yaml
-	sha256sums = 0162b6f97c6fda82a2b86e1b544ae10cb0d17e7561a3b3930d782dfef5a89d74
+	sha256sums = 6ec3ff769f3c9775443009d76da5fca010ee94f1e71f474af6be5a33b9a8e70c
 	sha256sums = a5e8669b915dc6553f0af9137840adfabb020f391846d9f3ab3dbe3175d320fa
 	sha256sums = 2014138283a50581136b85a4d4964ee70821cb0ed965fa5acc1c3d7611855288
-	sha256sums = 46c37eca9600032a36c510fed63838e003f46b967b19538ff7cbc26a74849a54
-	source_i686 = https://github.com/tectiv3/standardfile/releases/download/v0.5.0/standardfile_0.5.0_linux_32-bit.tar.gz
-	sha256sums_i686 = a87fe60aa2a172526c5aae46a6a099b7bde40f67f3b43f408fdd2410669a2aa0
-	source_x86_64 = https://github.com/tectiv3/standardfile/releases/download/v0.5.0/standardfile_0.5.0_linux_64-bit.tar.gz
-	sha256sums_x86_64 = c8120132c7d148e28f8e4a4670d30fb715e256611bf97903991cbc20f7742fd7
-	source_armv6h = https://github.com/tectiv3/standardfile/releases/download/v0.5.0/standardfile_0.5.0_linux_arm6.tar.gz
-	sha256sums_armv6h = 24b91436a6dd4d53186edfaaed8d33c6ac4d19a83555044ba4fcebd44a8ada25
-	source_armv7h = https://github.com/tectiv3/standardfile/releases/download/v0.5.0/standardfile_0.5.0_linux_arm7.tar.gz
-	sha256sums_armv7h = 458bbf2fe58af523e9d816cf8727b324ad66f246ad51fedabf18e31558cec751
-	source_aarch64 = https://github.com/tectiv3/standardfile/releases/download/v0.5.0/standardfile_0.5.0_linux_arm8.tar.gz
-	sha256sums_aarch64 = 2ca2e7f883387c127fc1fc4de3372639a199ae502f37d7340546455a81af65c9
+	sha256sums = 1010525aa4b320cb0ccf7b5411ca5879892c34711f1505f26be3f16214ead07c
+	sha256sums = 1010525aa4b320cb0ccf7b5411ca5879892c34711f1505f26be3f16214ead07c
+	source_x86_64 = https://github.com/mdouchement/standardfile/releases/download/v0.8.0/standardfile-linux-amd64
+	sha256sums_x86_64 = 1736d1a70ded75de9f9bcca2f479b5b4ee63ae6ddd0f25bcc0a2eecbfec9fe12
+	source_aarch64 = https://github.com/tectiv3/standardfile/releases/download/v0.8.0/standardfile_0.8.0_linux_arm8.tar.gz
+	sha256sums_aarch64 = 972511c60986c5cf6564fd9c71849b752a36a277122dccca6f15e3aa40858cfc
 
 pkgname = standardfile-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index fff3ca418294..077ef7dfd60d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,33 @@
 # Maintainer: Martins Mozeikox <martins.mozeiko@gmail.com>
 
 pkgname=standardfile-bin
-pkgver=0.5.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc='Standard File Server, Go Implementation'
 url='https://github.com/tectiv3/standardfile'
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+arch=('x86_64' 'aarch64')
 license=('MIT')
 depends=('glibc')
 backup=('etc/standardfile.yaml')
-source_i686=("https://github.com/tectiv3/standardfile/releases/download/v${pkgver}/standardfile_${pkgver}_linux_32-bit.tar.gz")
-source_x86_64=("https://github.com/tectiv3/standardfile/releases/download/v${pkgver}/standardfile_${pkgver}_linux_64-bit.tar.gz")
-source_arm=("https://github.com/tectiv3/standardfile/releases/download/v${pkgver}/standardfile_${pkgver}_linux_arm6.tar.gz")
-source_armv6h=("https://github.com/tectiv3/standardfile/releases/download/v${pkgver}/standardfile_${pkgver}_linux_arm6.tar.gz")
-source_armv7h=("https://github.com/tectiv3/standardfile/releases/download/v${pkgver}/standardfile_${pkgver}_linux_arm7.tar.gz")
+source_x86_64=("https://github.com/mdouchement/standardfile/releases/download/v${pkgver}/standardfile-linux-amd64")
 source_aarch64=("https://github.com/tectiv3/standardfile/releases/download/v${pkgver}/standardfile_${pkgver}_linux_arm8.tar.gz")
-sha256sums_i686=('a87fe60aa2a172526c5aae46a6a099b7bde40f67f3b43f408fdd2410669a2aa0')
-sha256sums_x86_64=('c8120132c7d148e28f8e4a4670d30fb715e256611bf97903991cbc20f7742fd7')
-sha256sums_arm=('24b91436a6dd4d53186edfaaed8d33c6ac4d19a83555044ba4fcebd44a8ada25')
-sha256sums_armv6h=('24b91436a6dd4d53186edfaaed8d33c6ac4d19a83555044ba4fcebd44a8ada25')
-sha256sums_armv7h=('458bbf2fe58af523e9d816cf8727b324ad66f246ad51fedabf18e31558cec751')
-sha256sums_aarch64=('2ca2e7f883387c127fc1fc4de3372639a199ae502f37d7340546455a81af65c9')
+sha256sums_x86_64=('1736d1a70ded75de9f9bcca2f479b5b4ee63ae6ddd0f25bcc0a2eecbfec9fe12')
+sha256sums_aarch64=('972511c60986c5cf6564fd9c71849b752a36a277122dccca6f15e3aa40858cfc')
 source=(standardfile.service
         standardfile.sysusers
         standardfile.tmpfiles
+        standardfile.example.yaml
         standardfile.yaml)
-sha256sums=('0162b6f97c6fda82a2b86e1b544ae10cb0d17e7561a3b3930d782dfef5a89d74'
+sha256sums=('6ec3ff769f3c9775443009d76da5fca010ee94f1e71f474af6be5a33b9a8e70c'
             'a5e8669b915dc6553f0af9137840adfabb020f391846d9f3ab3dbe3175d320fa'
             '2014138283a50581136b85a4d4964ee70821cb0ed965fa5acc1c3d7611855288'
-            '46c37eca9600032a36c510fed63838e003f46b967b19538ff7cbc26a74849a54')
+            '1010525aa4b320cb0ccf7b5411ca5879892c34711f1505f26be3f16214ead07c'
+            '1010525aa4b320cb0ccf7b5411ca5879892c34711f1505f26be3f16214ead07c')
 
 package() {
-  install -Dm 755 "${srcdir}/standardfile"          "${pkgdir}/usr/bin/standardfile"
+  install -Dm 755 "${srcdir}/standardfile-linux-amd64"          "${pkgdir}/usr/bin/standardfile"
   install -Dm 644 "${srcdir}/standardfile.service"  "${pkgdir}/usr/lib/systemd/system/standardfile.service"
   install -Dm 644 "${srcdir}/standardfile.sysusers" "${pkgdir}/usr/lib/sysusers.d/standardfile.conf"
   install -Dm 644 "${srcdir}/standardfile.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/standarfile.conf"
-  install -Dm 644 "${srcdir}/standardfile.yaml"      "${pkgdir}/etc/standardfile.yaml"
+  install -Dm 644 "${srcdir}/standardfile.example.yaml"      "${pkgdir}/etc/standardfile.example.yaml"
 }
diff --git a/standardfile.example.yaml b/standardfile.example.yaml
new file mode 100644
index 000000000000..86d2572c9d65
--- /dev/null
+++ b/standardfile.example.yaml
@@ -0,0 +1,21 @@
+Secrets can optionally be provided by the systemd LoadCredential directive. Example:
+#   LoadCredential=secret_key:/var/lib/standardfile/secret_key.txt
+#   LoadCredential=session.secret:/var/lib/standardfile/session_secret.txt
+
+# Address to bind
+address: "localhost:4565"
+# Registrations are open when it is set to false.
+no_registration: false
+# Show real version in `GET /version'
+show_real_version: false
+# Database folder path; empty value means current directory. You need to init the db with standardfile init -c /etc/standardfile.yaml then make the db file writable for standardfile user. 
+database_path: "/var/lib/standardfile/"
+# Secret key used for JWT authentication (before 004 and 20200115)
+# If missing, will be read from $CREDENTIALS_DIRECTORY/secret_key file
+secret_key: ChangeThisWithASecretCode
+# Session used for authentication (since 004 and 20200115)
+session:
+  # If missing, will be read from $CREDENTIALS_DIRECTORY/session.secret file
+  secret: ChangeThisWithASecretCode
+  access_token_ttl: 1440h # 60 days expressed in Golang's time.Duration format
+  refresh_token_ttl: 8760h # 1 year
diff --git a/standardfile.yaml b/standardfile.yaml
index 3d98c68d2157..86d2572c9d65 100644
--- a/standardfile.yaml
+++ b/standardfile.yaml
@@ -1,6 +1,21 @@
-port: 8888
-foreground: false
-debug: false
-noreg: true
-cors: true
-db: /var/lib/standardfile/standardfile.db
+Secrets can optionally be provided by the systemd LoadCredential directive. Example:
+#   LoadCredential=secret_key:/var/lib/standardfile/secret_key.txt
+#   LoadCredential=session.secret:/var/lib/standardfile/session_secret.txt
+
+# Address to bind
+address: "localhost:4565"
+# Registrations are open when it is set to false.
+no_registration: false
+# Show real version in `GET /version'
+show_real_version: false
+# Database folder path; empty value means current directory. You need to init the db with standardfile init -c /etc/standardfile.yaml then make the db file writable for standardfile user. 
+database_path: "/var/lib/standardfile/"
+# Secret key used for JWT authentication (before 004 and 20200115)
+# If missing, will be read from $CREDENTIALS_DIRECTORY/secret_key file
+secret_key: ChangeThisWithASecretCode
+# Session used for authentication (since 004 and 20200115)
+session:
+  # If missing, will be read from $CREDENTIALS_DIRECTORY/session.secret file
+  secret: ChangeThisWithASecretCode
+  access_token_ttl: 1440h # 60 days expressed in Golang's time.Duration format
+  refresh_token_ttl: 8760h # 1 year