[arch-commits] Commit in hyperkitty/trunk (PKGBUILD hyperkitty.tmpfiles)

[David Runge]

    Date: Sunday, March 15, 2020 @ 19:35:31
  Author: dvzrv
Revision: 598423

upgpkg: hyperkitty 1.3.2-6: Adding settings_local.py in configuration dir for user configuration and making the default settings.py readonly.

Modified:
  hyperkitty/trunk/PKGBUILD
  hyperkitty/trunk/hyperkitty.tmpfiles

---------------------+
 PKGBUILD            |   15 ++++++++-------
 hyperkitty.tmpfiles |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-15 18:59:06 UTC (rev 598422)
+++ PKGBUILD	2020-03-15 19:35:31 UTC (rev 598423)
@@ -3,7 +3,7 @@
 _name=HyperKitty
 pkgname=hyperkitty
 pkgver=1.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A web interface to access GNU Mailman v3 archives"
 arch=('any')
 url="https://gitlab.com/mailman/hyperkitty"
@@ -22,7 +22,7 @@
             'uwsgi-plugin-python: for running inside uwsgi'
             'ruby-sassc: alternative to sassc')
 backup=("etc/uwsgi/${pkgname}.ini"
-        "etc/webapps/${pkgname}/settings.py")
+        "etc/webapps/${pkgname}/settings_local.py")
 install="${pkgname}.install"
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}
         "${pkgname}-1.3.2-django3.patch::https://gitlab.com/mailman/hyperkitty/-/merge_requests/228.patch"
@@ -37,7 +37,7 @@
             'ec08a05402729bc23f9bff11be85630343f257d2bdb0531941d9f1475a3bb6b80d7083e2a0291517264247076b7639ecc427bdc5d5d37d9b8f094f6f484f6f96'
             'a41c938082ceee555143ddb21c3a95835f9832b9aff423142d78d3e52f12500561f80e0ce43c67a4f190065c9d045945741ac71ab3307db1419c4dc0686db09a'
             '3267427109b08b8c9336b187381ed14357a07370bdcdfc24da94555020ad0424c5bbebc09e131e981e0540c51db443ffe558209e1bca7c2a1b7b1f602ed0805b'
-            '778cdf0fb26578f0e039e688dff4a33e4e12f940f977dce4880b3f28dd5ac2c7730b05dc157a0a233723f8cbca18bcbe81a1daddf90a58c41916c18a0c2db210'
+            'e734e28fbaa5d7143a5c31161b2de0beed5435cb4fa48521ec0e82ed81b045f07bd4ca61f9da81c87dfe2cc5a5ecf79eb9ed4c255a31f97c69fe97bf6df37073'
             '351f40a6bc1fd1735c883408f9941808e081206927a7c02467e03228243dd156378cac21f851b498702bd4f96fde8e4c80536dbcc6f3c384bf708bed4e988971')
 validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhilash1 at gmail.com>
 
@@ -49,6 +49,7 @@
   patch -Np1 -i "../${pkgname}-1.3.2-django3.patch"
   # setting FHS compliant default paths
   patch -Np1 -i "../${pkgname}-1.3.2-settings.patch"
+  touch settings_local.py
 }
 
 build() {
@@ -75,7 +76,7 @@
   # doc
   install -vDm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
   # django project
-  install -vDm 644 example_project/{__init__,manage,urls,wsgi}.py \
+  install -vDm 644 example_project/{__init__,manage,settings,urls,wsgi}.py \
     -t "${pkgdir}/usr/share/webapps/${pkgname}"
   # symlink locale and static dirs to state dir
   ln -svf "/var/lib/${pkgname}/locale/" \
@@ -88,10 +89,10 @@
   # log dir
   install -vdm 750 "${pkgdir}/var/log/${pkgname}"
   # config
-  install -vDm 640 example_project/settings.py \
+  install -vDm 640 settings_local.py \
     -t "${pkgdir}/etc/webapps/${pkgname}"
-  ln -svf "/etc/webapps/${pkgname}/settings.py" \
-    "${pkgdir}/usr/share/webapps/${pkgname}/settings.py"
+  ln -svf "/etc/webapps/${pkgname}/settings_local.py" \
+    "${pkgdir}/usr/share/webapps/${pkgname}/settings_local.py"
   # systemd service
   install -vDm 644 "../${pkgname}-qcluster.service" \
     -t "${pkgdir}/usr/lib/systemd/system"

Modified: hyperkitty.tmpfiles
===================================================================
--- hyperkitty.tmpfiles	2020-03-15 18:59:06 UTC (rev 598422)
+++ hyperkitty.tmpfiles	2020-03-15 19:35:31 UTC (rev 598423)
@@ -1,4 +1,4 @@
-z /etc/webapps/hyperkitty/settings.py 0640 root hyperkitty -
+z /etc/webapps/hyperkitty/settings_local.py 0640 root hyperkitty -
 d %L/hyperkitty 750 hyperkitty hyperkitty -
 d %S/hyperkitty - hyperkitty hyperkitty -
 d %S/hyperkitty/data 750 hyperkitty hyperkitty -