[arch-commits] Commit in hyperkitty/trunk (3 files)

[David Runge]

    Date: Sunday, February 2, 2020 @ 01:06:49
  Author: dvzrv
Revision: 561206

upgpkg: hyperkitty 1.3.2-5: Changing the default location for the sqlite database to /var/lib/hyperkitty/data/, so that restrictive access permissions can be applied only to that directory. Web servers otherwise are unable to reach the static directory, if the state dir is chmod 750. Disabling non-functional facbook allauth provider.

Modified:
  hyperkitty/trunk/PKGBUILD
  hyperkitty/trunk/hyperkitty-1.3.2-settings.patch
  hyperkitty/trunk/hyperkitty.tmpfiles

---------------------------------+
 PKGBUILD                        |   10 +++++-----
 hyperkitty-1.3.2-settings.patch |   13 +++++++++++--
 hyperkitty.tmpfiles             |    3 ++-
 3 files changed, 18 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-02 00:52:18 UTC (rev 561205)
+++ PKGBUILD	2020-02-02 01:06:49 UTC (rev 561206)
@@ -3,7 +3,7 @@
 _name=HyperKitty
 pkgname=hyperkitty
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A web interface to access GNU Mailman v3 archives"
 arch=('any')
 url="https://gitlab.com/mailman/hyperkitty"
@@ -34,10 +34,10 @@
 sha512sums=('c0c20f0a0d999e08be32f9db52f43660179b2277e80385bb4ef58f2a652b8271e03690282aa3174a3408c48bd7e5ee18c5a8adcee736a45165647cb124cd6293'
             'SKIP'
             '04b593949c80362324103726f54a73d5904f053efb5ef90cd3fbdefd90e93c707052bcb8cddf5b64efc1f053f5c51ad76285833448f6fcdff4bdfbf640f6b8c2'
-            'f1a4112db9032d1140b67dddf6c0fe3f23a87f0ec4a521b0dd788eb6b9cd3409ef2604418ec27edeb39deae48f4f8fdfda3e40f05200c3230ef6ed9c5f545d55'
+            'ec08a05402729bc23f9bff11be85630343f257d2bdb0531941d9f1475a3bb6b80d7083e2a0291517264247076b7639ecc427bdc5d5d37d9b8f094f6f484f6f96'
             'a41c938082ceee555143ddb21c3a95835f9832b9aff423142d78d3e52f12500561f80e0ce43c67a4f190065c9d045945741ac71ab3307db1419c4dc0686db09a'
             '3267427109b08b8c9336b187381ed14357a07370bdcdfc24da94555020ad0424c5bbebc09e131e981e0540c51db443ffe558209e1bca7c2a1b7b1f602ed0805b'
-            '0b24e82a75c55bc46b0f164285772168079ce298530bb228b230b2cc64a3a1c6ee2cfb8083c866ef59c71e66c2a237d7dc1f5bdc6928142c66d3057542304886'
+            '778cdf0fb26578f0e039e688dff4a33e4e12f940f977dce4880b3f28dd5ac2c7730b05dc157a0a233723f8cbca18bcbe81a1daddf90a58c41916c18a0c2db210'
             '351f40a6bc1fd1735c883408f9941808e081206927a7c02467e03228243dd156378cac21f851b498702bd4f96fde8e4c80536dbcc6f3c384bf708bed4e988971')
 validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhilash1 at gmail.com>
 
@@ -78,12 +78,12 @@
   install -vDm 644 example_project/{__init__,manage,urls,wsgi}.py \
     -t "${pkgdir}/usr/share/webapps/${pkgname}"
   # symlink locale and static dirs to state dir
-  ln -svf "/var/lib//${pkgname}/locale/" \
+  ln -svf "/var/lib/${pkgname}/locale/" \
     "${pkgdir}/usr/share/webapps/${pkgname}"
   ln -svf "/var/lib/${pkgname}/static/" \
     "${pkgdir}/usr/share/webapps/${pkgname}"
   # state dir
-  install -vdm 750 "${pkgdir}/var/lib/${pkgname}"
+  install -vdm 750 "${pkgdir}/var/lib/${pkgname}/data"
   install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"{locale,static}
   # log dir
   install -vdm 750 "${pkgdir}/var/log/${pkgname}"

Modified: hyperkitty-1.3.2-settings.patch
===================================================================
--- hyperkitty-1.3.2-settings.patch	2020-02-02 00:52:18 UTC (rev 561205)
+++ hyperkitty-1.3.2-settings.patch	2020-02-02 01:06:49 UTC (rev 561206)
@@ -1,13 +1,22 @@
 diff --git c/example_project/settings.py w/example_project/settings.py
-index 1c965f5..4d8157e 100644
+index 1c965f5..70de5d4 100644
 --- c/example_project/settings.py
 +++ w/example_project/settings.py
+@@ -75,7 +75,7 @@ INSTALLED_APPS = (
+     'allauth.socialaccount.providers.github',
+     'allauth.socialaccount.providers.gitlab',
+     'allauth.socialaccount.providers.google',
+-    'allauth.socialaccount.providers.facebook',
++    # 'allauth.socialaccount.providers.facebook',
+     'allauth.socialaccount.providers.twitter',
+     'allauth.socialaccount.providers.stackexchange',
+ )
 @@ -129,7 +129,7 @@ DATABASES = {
          # Use 'sqlite3', 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
          'ENGINE': 'django.db.backends.sqlite3',
          # DB name or path to database file if using sqlite3.
 -        'NAME': os.path.join(BASE_DIR, 'hyperkitty.db'),
-+        'NAME': '/var/lib/hyperkitty/hyperkitty.db',
++        'NAME': '/var/lib/hyperkitty/data/hyperkitty.db',
          # The following settings are not used with sqlite3:
          'USER': 'hyperkitty',
          'PASSWORD': 'hkpass',

Modified: hyperkitty.tmpfiles
===================================================================
--- hyperkitty.tmpfiles	2020-02-02 00:52:18 UTC (rev 561205)
+++ hyperkitty.tmpfiles	2020-02-02 01:06:49 UTC (rev 561206)
@@ -1,6 +1,7 @@
 z /etc/webapps/hyperkitty/settings.py 0640 root hyperkitty -
 d %L/hyperkitty 750 hyperkitty hyperkitty -
-d %S/hyperkitty 750 hyperkitty hyperkitty -
+d %S/hyperkitty - hyperkitty hyperkitty -
+d %S/hyperkitty/data 750 hyperkitty hyperkitty -
 d %S/hyperkitty/locale - hyperkitty hyperkitty -
 d %S/hyperkitty/static - hyperkitty hyperkitty -
 d %t/hyperkitty - hyperkitty hyperkitty -