Bump to v0.11.1

6 files changed, 62 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3862abc729d..f9e6a169bf70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = writefreely
 	pkgdesc = Federated blogging from write.as
-	pkgver = 0.10.0
+	pkgver = 0.11.1
 	pkgrel = 1
 	url = https://writefreely.org/
 	install = writefreely.install
 	arch = x86_64
 	license = AGPL3
 	makedepends = go
-	makedepends = go-bindata
 	makedepends = sqlite
+	makedepends = go-bindata
 	makedepends = nodejs-less
 	makedepends = nodejs-less-plugin-clean-css
 	depends = glibc
@@ -19,12 +19,12 @@ pkgbase = writefreely
 	source = writefreely.service
 	source = config.ini
 	source = makefile.patch
-	source = https://github.com/writeas/writefreely/archive/v0.10.0.tar.gz
+	source = https://github.com/writeas/writefreely/archive/v0.11.1.tar.gz
 	sha256sums = 6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10
 	sha256sums = 60d4b49872523a2aed3e0e6a55513dfefe5ae6cbec43f2fcc65db894fb3bd2a3
-	sha256sums = e357b687bd0eab95996711276216b6f2dc534ba9214ae094172d6d7a6b1fdae5
+	sha256sums = c061a38c62ae76aaeade0b818215ec67eb55543f1f9778fbd13818be73f9c501
 	sha256sums = f6282ce91ada86b77f54469f0c24db20089b87bf4593ee23f5855cbf5fde4859
-	sha256sums = 7ba4208ece3c6e94573e1acb89506b3dd803ec10b98f291d72a372d032b326a6
+	sha256sums = 0304da7838f8a7878f94b4d40aa40e3af4131264b1e3bfd9daa2c3147bc00032
 
 pkgname = writefreely
 
diff --git a/PKGBUILD b/PKGBUILD
index 5f25c2ab1842..be6a78e6ff34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sam Whited <sam@samwhited.com>
 
 pkgname=writefreely
-pkgver=0.10.0
+pkgver=0.11.1
 pkgrel=1
 pkgdesc='Federated blogging from write.as'
 arch=('x86_64')
@@ -9,24 +9,26 @@ url='https://writefreely.org/'
 license=('AGPL3')
 depends=('glibc')
 makedepends=('go'
-             'go-bindata'
              'sqlite'
+             'go-bindata'
              'nodejs-less'
              'nodejs-less-plugin-clean-css')
 optdepends=('sqlite: For SQLite support',
             'mariadb: For MariaDB support')
 backup=('etc/writefreely/config.ini')
-install=writefreely.install
-source=(writefreely-sysusers.conf
-        writefreely.service
+install="${pkgname}.install"
+source=("${pkgname}-sysusers.conf"
+        "${pkgname}.service"
+        "${pkgname}.tmpfiles"
         config.ini
         makefile.patch
         "https://github.com/writeas/writefreely/archive/v${pkgver}.tar.gz")
 sha256sums=('6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10'
-            '60d4b49872523a2aed3e0e6a55513dfefe5ae6cbec43f2fcc65db894fb3bd2a3'
-            'e357b687bd0eab95996711276216b6f2dc534ba9214ae094172d6d7a6b1fdae5'
+            '28328462c921cc6dfc690231da190ed77635da60d5f76c9f2646aeb0cc48f13e'
+            '7884d61cf16b7ef94616c5aa2954229979dace22deb6d5c2ece25405bcf41aae'
+            '4c404097744537bc3c6b58913c4c20a36da8a8953b756f80b136c2b11b02e6d3'
             'f6282ce91ada86b77f54469f0c24db20089b87bf4593ee23f5855cbf5fde4859'
-            '7ba4208ece3c6e94573e1acb89506b3dd803ec10b98f291d72a372d032b326a6')
+            '0304da7838f8a7878f94b4d40aa40e3af4131264b1e3bfd9daa2c3147bc00032')
 
 prepare() {
   export GO111MODULE=on
@@ -44,15 +46,16 @@ build() {
 }
 
 package() {
-  install -dm750 "${pkgdir}"/var/lib/${pkgname}/data
-  install -dm750 "${pkgdir}"/var/lib/${pkgname}/keys
-  install -dm750 "${pkgdir}"/usr/share/${pkgname}/pages
-  install -dm750 "${pkgdir}"/usr/share/${pkgname}/static
-  install -dm750 "${pkgdir}"/usr/share/${pkgname}/templates
+  install -dm700 "${pkgdir}"/var/lib/${pkgname}/data
+  install -dm700 "${pkgdir}"/var/lib/${pkgname}/keys
+  install -dm755 "${pkgdir}"/usr/share/${pkgname}/pages
+  install -dm755 "${pkgdir}"/usr/share/${pkgname}/static
+  install -dm755 "${pkgdir}"/usr/share/${pkgname}/templates
 
   install -Dm644 config.ini "${pkgdir}"/etc/writefreely/config.ini
-  install -Dm644 writefreely.service -t "${pkgdir}"/usr/lib/systemd/system/
-  install -Dm644 writefreely-sysusers.conf "${pkgdir}"/usr/lib/sysusers.d/writefreely.conf
+  install -Dm644 "${pkgname}.service" -t "${pkgdir}"/usr/lib/systemd/system/
+  install -Dm644 "${pkgname}-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -Dm644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
   install -Dm755 "${pkgname}-${pkgver}"/cmd/writefreely/writefreely "${pkgdir}"/usr/bin/writefreely
 
   cp -r "${pkgname}-${pkgver}"/pages/* "${pkgdir}"/usr/share/writefreely/pages
diff --git a/config.ini b/config.ini
index c0177d33196b..e1aa83f24e82 100644
--- a/config.ini
+++ b/config.ini
@@ -1,14 +1,14 @@
 [server]
-hidden_host   = 
-port          = 8080
-bind          = localhost
-tls_cert_path = 
-tls_key_path  = 
-
-keys_parent_dir      = "/var/lib/writefreely"
-pages_parent_dir     = "/usr/share/writefreely"
-static_parent_dir    = "/usr/share/writefreely"
-templates_parent_dir = "/usr/share/writefreely"
+hidden_host          =
+port                 = 8080
+bind                 = localhost
+tls_cert_path        =
+tls_key_path         =
+autocert             = true
+templates_parent_dir = /usr/share/writefreely
+static_parent_dir    = /usr/share/writefreely
+pages_parent_dir     = /usr/share/writefreely
+keys_parent_dir      = /var/lib/writefreely
 
 [database]
 type     = sqlite3
@@ -16,22 +16,30 @@ filename = /var/lib/writefreely/data/data.db
 username =
 password =
 database =
-host     =
-port     =
+host     = localhost
+port     = 3306
 
 [app]
-site_name         = 
-site_description  = 
-host              = http://localhost:8080
-theme             = write
-disable_js        = false
-webfonts          = true
-single_user       = true
-open_registration = false
-min_username_len  = 3
-max_blogs         = 1
-federation        = true
-public_stats      = true
-private           = false
-local_timeline    = false
+site_name          =
+site_description   =
+host               = http://localhost:8080
+theme              = write
+editor             =
+disable_js         = false
+webfonts           = true
+landing            =
+simple_nav         = false
+wf_modesty         = false
+chorus             = false
+disable_drafts     = false
+single_user        = true
+open_registration  = false
+min_username_len   = 3
+max_blogs          = 1
+federation         = true
+public_stats       = true
+private            = false
+local_timeline     = false
+user_invites       =
+default_visibility =
 
diff --git a/writefreely.install b/writefreely.install
index b9e1f143000d..6f7719f65b9c 100644
--- a/writefreely.install
+++ b/writefreely.install
@@ -1,11 +1,11 @@
 post_update() {
 	echo "---"
-	echo "After updating, run 'writefreely --migrate' to update the database."
+	echo "After updating, backup the database then run run 'writefreely --migrate'."
 	echo "---"
 }
 
 post_install() {
   cd /var/lib/writefreely
-  sudo -u writefreely /usr/bin/writefreely -c /etc/writefreely/config.ini -gen-keys
-  sudo -u writefreely /usr/bin/writefreely -c /etc/writefreely/config.ini -init-db
+  /usr/bin/writefreely -c /etc/writefreely/config.ini -gen-keys
+  /usr/bin/writefreely -c /etc/writefreely/config.ini -init-db
 }
diff --git a/writefreely.service b/writefreely.service
index 659a81944b66..e43b812e1652 100644
--- a/writefreely.service
+++ b/writefreely.service
@@ -10,7 +10,7 @@ User=writefreely
 Group=writefreely
 Type=simple
 WorkingDirectory=/var/lib/writefreely
-ExecStart=/usr/bin/writefreely -c config.ini
+ExecStart=/usr/bin/writefreely -c /etc/writefreely/config.ini
 Restart=always
 RestartSec=2s
 CapabilityBoundingSet=
diff --git a/writefreely.tmpfiles b/writefreely.tmpfiles
new file mode 100644
index 000000000000..86ceff87f125
--- /dev/null
+++ b/writefreely.tmpfiles
@@ -0,0 +1 @@
+Z /var/lib//writefreely 0700 writefreely writefreely - -