Merge b7eef41b39 into b9900a14cd

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgbase='ahriman'
-pkgname=('ahriman' 'ahriman-distributed' 'ahriman-triggers' 'ahriman-web')
+pkgname=('ahriman' 'ahriman-triggers' 'ahriman-web')
 pkgver=2.15.2
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
@@ -22,8 +22,7 @@ build() {
 
 package_ahriman() {
     pkgname='ahriman'
-    optdepends=('ahriman-distributed: distributed build support'
-                'ahriman-triggers: additional extensions for the application'
+    optdepends=('ahriman-triggers: additional extensions for the application'
                 'ahriman-web: web server'
                 'python-boto3: sync to s3'
                 'python-cerberus: configuration validator'
@@ -49,20 +48,6 @@ package_ahriman() {
     install -Dm644 "$srcdir/$pkgbase.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
 }
 
-package_ahriman-distributed() {
-    pkgname='ahriman-distributed'
-    pkgdesc="ArcH linux ReposItory MANager, distributed build support"
-    depends=("$pkgbase=$pkgver")
-    backup=('etc/ahriman.ini.d/00-distributed.ini')
-
-    cd "$pkgbase-$pkgver"
-
-    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
-    python subpackages.py "$pkgdir" "$pkgname"
-
-    install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini.d/00-distributed.ini" "$pkgdir/etc/ahriman.ini.d/00-distributed.ini"
-}
-
 package_ahriman-triggers() {
     pkgname='ahriman-triggers'
     pkgdesc="ArcH linux ReposItory MANager, additional extensions"
@@ -80,7 +65,7 @@ package_ahriman-triggers() {
 package_ahriman-web() {
     pkgname='ahriman-web'
     pkgdesc="ArcH linux ReposItory MANager, web server"
-    depends=("$pkgbase=$pkgver" 'python-aiohttp-apispec>=3.0.0' 'python-aiohttp-cors' 'python-aiohttp-jinja2')
+    depends=("$pkgbase=$pkgver" 'python-aiohttp-apispec-git' 'python-aiohttp-cors' 'python-aiohttp-jinja2')
     optdepends=('python-aioauth-client: OAuth2 authorization support'
                 'python-aiohttp-security: authorization support'
                 'python-aiohttp-session: authorization support'

package/share/ahriman/settings/ahriman.ini.d/00-distributed.ini

@@ -1,8 +0,0 @@
-[build]
-; List of well-known triggers. Used only for configuration purposes.
-triggers_known[] = ahriman.core.distributed.WorkerLoaderTrigger
-triggers_known[] = ahriman.core.distributed.WorkerTrigger
-; List of worker nodes addresses used for build process, e.g.:
-;     workers = http://10.0.0.1:8080 http://10.0.0.3:8080
-; Empty list means run on the local instance.
-;workers =

package/share/ahriman/settings/ahriman.ini.d/00-triggers.ini

@@ -1,7 +1,13 @@
 [build]
 ; List of well-known triggers. Used only for configuration purposes.
+triggers_known[] = ahriman.core.distributed.WorkerLoaderTrigger
+triggers_known[] = ahriman.core.distributed.WorkerTrigger
 triggers_known[] = ahriman.core.support.KeyringTrigger
 triggers_known[] = ahriman.core.support.MirrorlistTrigger
+; List of worker nodes addresses used for build process, e.g.:
+;     workers = http://10.0.0.1:8080 http://10.0.0.3:8080
+; Empty list means run on the local instance.
+;workers =
 
 [keyring]
 ; List of configuration section names for keyring generator plugin, e.g.:

subpackages.py

@@ -33,12 +33,9 @@ SUBPACKAGES = {
         prefix / "share",
         site_packages / "ahriman",
     ],
-    "ahriman-distributed": [
-        prefix / "share" / "ahriman" / "settings" / "ahriman.ini.d" / "00-distributed.ini",
-        site_packages / "ahriman" / "core" / "distributed",
-    ],
     "ahriman-triggers": [
         prefix / "share" / "ahriman" / "settings" / "ahriman.ini.d" / "00-triggers.ini",
+        site_packages / "ahriman" / "core" / "distributed",
         site_packages / "ahriman" / "core" / "support",
     ],
     "ahriman-web": [