Large package cleanup

5 files changed, 25 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index def1e969ee9d..ac11e4b0fe99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = writefreely
 	pkgdesc = Federated blogging from write.as
 	pkgver = 0.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://writefreely.org/
 	install = writefreely.install
 	arch = x86_64
 	license = AGPL3
+	makedepends = sqlite
 	optdepends = sqlite: For SQLite support,
 	optdepends = mariadb: For MariaDB support
 	backup = var/lib/writefreely/config.ini
-	source = writefreely.tmpfiles
 	source = writefreely-sysusers.conf
 	source = writefreely.service
 	source = config.ini
 	source = https://github.com/writeas/writefreely/releases/download/v0.7.0/writefreely_0.7.0_linux_amd64.tar.gz
-	sha256sums = fe04838284663b3725d5bb1cd82ca8fbe180512d59200c88b0a5829f8e390b2d
 	sha256sums = 6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10
-	sha256sums = dbb332d30c49a8b9f8a1f926c0b3439c1487d395fbef979481f9e76e53a3bcaa
+	sha256sums = 142fcf18320a418b73ed0678acea58ae69287e47760d6abb5283376c21092dec
 	sha256sums = 6946f0211b25743451954d2c155222df2aeaf7f49c3fafcb9183c6fc62a95ef9
 	sha256sums = 8d2e1eaa5db61080b328f2d6d8677bb68859346c6920db0bd4f7e8d7fc9149b7
 
diff --git a/PKGBUILD b/PKGBUILD
index 35e5025fce68..17c03345e5f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,39 @@
 
 pkgname=writefreely
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Federated blogging from write.as'
 arch=('x86_64')
 url='https://writefreely.org/'
 license=('AGPL3')
+makedepends=('sqlite')
 optdepends=('sqlite: For SQLite support',
             'mariadb: For MariaDB support')
 backup=('var/lib/writefreely/config.ini')
 install=writefreely.install
-source=('writefreely.tmpfiles'
-        'writefreely-sysusers.conf'
+source=('writefreely-sysusers.conf'
         'writefreely.service'
         'config.ini'
         "https://github.com/writeas/writefreely/releases/download/v${pkgver}/writefreely_${pkgver}_linux_amd64.tar.gz")
-sha256sums=('fe04838284663b3725d5bb1cd82ca8fbe180512d59200c88b0a5829f8e390b2d'
-            '6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10'
-            'dbb332d30c49a8b9f8a1f926c0b3439c1487d395fbef979481f9e76e53a3bcaa'
+sha256sums=('6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10'
+            '142fcf18320a418b73ed0678acea58ae69287e47760d6abb5283376c21092dec'
             '6946f0211b25743451954d2c155222df2aeaf7f49c3fafcb9183c6fc62a95ef9'
             '8d2e1eaa5db61080b328f2d6d8677bb68859346c6920db0bd4f7e8d7fc9149b7')
 
 package() {
   # -o writefreely -g writefreely
-  install -dm770 "${pkgdir}"/var/lib/writefreely/data
-  install -dm770 "${pkgdir}"/var/lib/writefreely/keys
-  install -dm770 "${pkgdir}"/var/lib/writefreely/pages
-  install -dm770 "${pkgdir}"/var/lib/writefreely/static
-  install -dm770 "${pkgdir}"/var/lib/writefreely/templates
+  install -dm750 "${pkgdir}"/var/lib/writefreely/data
+  install -dm750 "${pkgdir}"/var/lib/writefreely/keys
+  install -dm750 "${pkgdir}"/var/lib/writefreely/pages
+  install -dm750 "${pkgdir}"/var/lib/writefreely/static
+  install -dm750 "${pkgdir}"/var/lib/writefreely/templates
   install -Dm644 writefreely.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm755 writefreely "${pkgdir}"/usr/bin/writefreely
-  install -Dm644 writefreely.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/writefreely.conf
   install -Dm644 writefreely-sysusers.conf "${pkgdir}"/usr/lib/sysusers.d/writefreely.conf
 
   # These files should probably be in /usr/share and /etc but writefreely
   # expects everything in the same directory.
   install -Dm644 config.ini "${pkgdir}"/var/lib/writefreely/config.ini
-  install -Dm644 schema.sql "${pkgdir}"/var/lib/writefreely/schema.sql
   cp -r pages/* "${pkgdir}"/var/lib/writefreely/pages
   cp -r static/* "${pkgdir}"/var/lib/writefreely/static
   cp -r templates/* "${pkgdir}"/var/lib/writefreely/templates
diff --git a/writefreely.install b/writefreely.install
index 30d076ee5b45..9c82d27ce31a 100644
--- a/writefreely.install
+++ b/writefreely.install
@@ -1,6 +1,14 @@
-post_install() {
-  chown -R writefreely:writefreely /var/lib/writefreely
+post_upgrade() {
+  echo "---"
+  echo "To begin, configure your blog using 'writefreely --configure'."
+  echo "If using mariadb, create a database called 'writefreely'"
+  echo "then initialize the database with 'writefreely --init-db'."
+  echo "---"
+}
 
+post_install() {
   cd /var/lib/writefreely
   sudo -u writefreely writefreely -gen-keys
+
+  post_upgrade
 }
diff --git a/writefreely.service b/writefreely.service
index 4672206f42b6..548a2ec1d008 100644
--- a/writefreely.service
+++ b/writefreely.service
@@ -29,6 +29,8 @@ MemoryDenyWriteExecute=true
 RestrictRealtime=true
 SystemCallArchitectures=native
 SystemCallFilter=@system-service
+StandardOutput=syslog
+StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/writefreely.tmpfiles b/writefreely.tmpfiles
deleted file mode 100644
index a80eb333e597..000000000000
--- a/writefreely.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/lib/writefreely      0750 writefreely writefreely
-d /var/lib/writefreely/keys 0750 writefreely writefreely