Release 2.13.6

In some cases (probably slow internet) in place initialization can cause
exception, because elements are not available yet. This commit moves
events initialization to $()

.github/workflows/setup.sh

@@ -12,7 +12,7 @@ pacman -Syu --noconfirm
 # main dependencies
 pacman -Sy --noconfirm devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo python-systemd sudo
 # make dependencies
-pacman -Sy --noconfirm python-build python-flit python-installer python-tox python-wheel
+pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-tox python-wheel
 # optional dependencies
 if [[ -z $MINIMAL_INSTALL ]]; then
     # VCS support
@@ -32,10 +32,13 @@ mv dist/ahriman-*.tar.gz package/archlinux
 chmod +777 package/archlinux  # because fuck you that's why
 cd package/archlinux
 sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
-sudo -u nobody -- makepkg --packagelist | pacman -U --noconfirm -
+sudo -u nobody -- makepkg --packagelist | grep -v -- -debug- | pacman -U --noconfirm -
 # create machine-id which is required by build tools
 systemd-machine-id-setup
 
+# remove unused dependencies
+pacman -Qdtq | pacman -Rscn --noconfirm -
+
 # initial setup command as root
 [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
 ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
@@ -50,7 +53,7 @@ if [[ -z $MINIMAL_INSTALL ]]; then
     WEB_PID=$!
 fi
 # add the first package
-sudo -u ahriman -- ahriman package-add --now ahriman
+sudo -u ahriman -- ahriman --log-handler console package-add --now ahriman
 # check if package was actually installed
 test -n "$(find "/var/lib/ahriman/repository/github/x86_64" -name "ahriman*pkg*")"
 # run package check

.pylintrc

@@ -83,6 +83,7 @@ limit-inference-results=100
 # usually to register additional checkers.
 load-plugins=pylint.extensions.docparams,
              definition_order,
+             import_order,
 
 # Pickle collected data for later comparisons.
 persistent=yes

.readthedocs.yml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.11"
+    python: "3.12"
 
 python:
   install:

Dockerfile

@@ -33,9 +33,9 @@ COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
 ## install package dependencies
 ## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size
 RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \
-    pacman -Sy --noconfirm --asdeps python-build python-flit python-installer python-wheel && \
+    pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-wheel && \
     pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket python-systemd rsync subversion && \
-    runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-apispec-git python-aiohttp-cors \
+    runuser -u build -- install-aur-package python-aioauth-client python-webargs python-aiohttp-apispec-git python-aiohttp-cors \
                                             python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security
 
 ## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container

docker/install-aur-package.sh

@@ -6,7 +6,7 @@ for PACKAGE in "$@"; do
     BUILD_DIR="$(mktemp -d)"
     git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR"
     cd "$BUILD_DIR"
-    makepkg --noconfirm --install --rmdeps --syncdeps
+    makepkg --nocheck --noconfirm --install --rmdeps --syncdeps
     cd /
     rm -r "$BUILD_DIR"
 done

docs/ahriman.core.log.rst

@@ -4,14 +4,6 @@ ahriman.core.log package
 Submodules
 ----------
 
-ahriman.core.log.filtered\_access\_logger module
-------------------------------------------------
-
-.. automodule:: ahriman.core.log.filtered_access_logger
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.core.log.http\_log\_handler module
 ------------------------------------------
 

docs/ahriman.web.views.v1.packages.rst

@@ -0,0 +1,61 @@
+ahriman.web.views.v1.packages package
+=====================================
+
+Submodules
+----------
+
+ahriman.web.views.v1.packages.changes module
+--------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.packages.changes
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.packages.logs module
+-----------------------------------------
+
+.. automodule:: ahriman.web.views.v1.packages.logs
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.packages.package module
+--------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.packages.package
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.packages.packages module
+---------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.packages.packages
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.packages.patch module
+------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.packages.patch
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.packages.patches module
+--------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.packages.patches
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v1.packages
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.web.views.v1.rst

@@ -8,6 +8,7 @@ Subpackages
    :maxdepth: 4
 
    ahriman.web.views.v1.distributed
+   ahriman.web.views.v1.packages
    ahriman.web.views.v1.service
    ahriman.web.views.v1.status
    ahriman.web.views.v1.user

docs/ahriman.web.views.v1.status.rst

@@ -4,14 +4,6 @@ ahriman.web.views.v1.status package
 Submodules
 ----------
 
-ahriman.web.views.v1.status.changes module
-------------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.changes
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.views.v1.status.info module
 ---------------------------------------
 
@@ -20,46 +12,6 @@ ahriman.web.views.v1.status.info module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.web.views.v1.status.logs module
----------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.logs
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.v1.status.package module
-------------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.package
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.v1.status.packages module
--------------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.packages
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.v1.status.patch module
-----------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.patch
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.v1.status.patches module
-------------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.patches
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.views.v1.status.repositories module
 -----------------------------------------------
 

docs/ahriman.web.views.v2.packages.rst

@@ -0,0 +1,21 @@
+ahriman.web.views.v2.packages package
+=====================================
+
+Submodules
+----------
+
+ahriman.web.views.v2.packages.logs module
+-----------------------------------------
+
+.. automodule:: ahriman.web.views.v2.packages.logs
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v2.packages
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.web.views.v2.rst

@@ -7,7 +7,7 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   ahriman.web.views.v2.status
+   ahriman.web.views.v2.packages
 
 Module contents
 ---------------

docs/ahriman.web.views.v2.status.rst

@@ -1,21 +0,0 @@
-ahriman.web.views.v2.status package
-===================================
-
-Submodules
-----------
-
-ahriman.web.views.v2.status.logs module
----------------------------------------
-
-.. automodule:: ahriman.web.views.v2.status.logs
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.web.views.v2.status
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/architecture.rst

@@ -41,7 +41,7 @@ This package contains everything required for the most of application actions an
 * ``ahriman.core.formatters`` package provides ``Printer`` sub-classes for printing data (e.g. package properties) to stdout which are used by some handlers.
 * ``ahriman.core.gitremote`` is a package with remote PKGBUILD triggers. Should not be called directly.
 * ``ahriman.core.http`` package provides HTTP clients which can be used later by other classes.
-* ``ahriman.core.log`` is a log utils package. It includes logger loader class, custom HTTP based logger and access logger for HTTP services with additional filters.
+* ``ahriman.core.log`` is a log utils package. It includes logger loader class, custom HTTP based logger and some wrappers.
 * ``ahriman.core.report`` is a package with reporting triggers. Should not be called directly.
 * ``ahriman.core.repository`` contains several traits and base repository (``ahriman.core.repository.Repository`` class) implementation.
 * ``ahriman.core.sign`` package provides sign feature (only gpg calls are available).

docs/configuration.rst

@@ -39,9 +39,9 @@ It will check current settings on common errors and compare configuration with k
 
 Base configuration settings.
 
-* ``apply_migrations`` - perform migrations on application start, boolean, optional, default ``yes``. Useful if you are using git version. Note, however, that this option must be changed only if you know what to do and going to handle migrations manually.
-* ``database`` - path to SQLite database, string, required.
-* ``include`` - path to directory with configuration files overrides, string, optional.
+* ``apply_migrations`` - perform database migrations on the application start, boolean, optional, default ``yes``. Useful if you are using git version. Note, however, that this option must be changed only if you know what to do and going to handle migrations manually.
+* ``database`` - path to the application SQLite database, string, required.
+* ``include`` - path to directory with configuration files overrides, string, optional. Files will be read in alphabetical order.
 * ``logging`` - path to logging configuration, string, required. Check ``logging.ini`` for reference.
 
 ``alpm:*`` groups
@@ -51,9 +51,9 @@ libalpm and AUR related configuration. Group name can refer to architecture, e.g
 
 * ``database`` - path to pacman system database cache, string, required.
 * ``mirror`` - package database mirror used by pacman for synchronization, string, required. This option supports standard pacman substitutions with ``$arch`` and ``$repo``. Note that the mentioned mirror should contain all repositories which are set by ``alpm.repositories`` option.
-* ``repositories`` - list of pacman repositories, space separated list of strings, required.
-* ``root`` - root for alpm library, string, required.
-* ``use_ahriman_cache`` - use local pacman package cache instead of system one, boolean, required. With this option enabled you might want to refresh database periodically (available as additional flag for some subcommands).
+* ``repositories`` - list of pacman repositories, used for package search, space separated list of strings, required.
+* ``root`` - root for alpm library, string, required. In the most cases it must point to the system root.
+* ``use_ahriman_cache`` - use local pacman package cache instead of system one, boolean, required. With this option enabled you might want to refresh database periodically (available as additional flag for some subcommands). If set to ``no``, databases must be synchronized manually.
 
 ``auth`` group
 --------------
@@ -64,7 +64,7 @@ Base authorization settings. ``OAuth`` provider requires ``aioauth-client`` libr
 * ``allow_read_only`` - allow requesting status APIs without authorization, boolean, required.
 * ``client_id`` - OAuth2 application client ID, string, required in case if ``oauth`` is used.
 * ``client_secret`` - OAuth2 application client secret key, string, required in case if ``oauth`` is used.
-* ``cookie_secret_key`` - secret key which will be used for cookies encryption, string, optional. It must be 32 url-safe base64-encoded bytes and can be generated as following ``base64.urlsafe_b64encode(os.urandom(32)).decode("utf8")``. If not set, it will be generated automatically; note, however, that in this case, all sessions will be automatically invalidated during the service restart.
+* ``cookie_secret_key`` - secret key which will be used for cookies encryption, string, optional. It must be 32 bytes URL-safe base64-encoded and can be generated as following ``base64.urlsafe_b64encode(os.urandom(32)).decode("utf8")``. If not set, it will be generated automatically; note, however, that in this case, all sessions will be automatically invalidated during the service restart.
 * ``max_age`` - parameter which controls both cookie expiration and token expiration inside the service in seconds, integer, optional, default is 7 days.
 * ``oauth_icon`` - OAuth2 login button icon, string, optional, default is ``google``. Must be valid `Bootstrap icon <https://icons.getbootstrap.com/>`__ name.
 * ``oauth_provider`` - OAuth2 provider class name as is in ``aioauth-client`` (e.g. ``GoogleClient``, ``GithubClient`` etc), string, required in case if ``oauth`` is used.
@@ -81,12 +81,13 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
 * ``archbuild_flags`` - additional flags passed to ``archbuild`` command, space separated list of strings, optional.
 * ``build_command`` - default build command, string, required.
 * ``ignore_packages`` - list packages to ignore during a regular update (manual update will still work), space separated list of strings, optional.
+* ``include_debug_packages`` - distribute debug packages, boolean, optional, default ``yes``.
 * ``makepkg_flags`` - additional flags passed to ``makepkg`` command, space separated list of strings, optional.
 * ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
 * ``triggers`` - list of ``ahriman.core.triggers.Trigger`` class implementation (e.g. ``ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger``) which will be loaded and run at the end of processing, space separated list of strings, optional. You can also specify triggers by their paths, e.g. ``/usr/lib/python3.10/site-packages/ahriman/core/report/report.py.ReportTrigger``. Triggers are run in the order of definition.
 * ``triggers_known`` - optional list of ``ahriman.core.triggers.Trigger`` class implementations which are not run automatically and used only for trigger discovery and configuration validation.
 * ``vcs_allowed_age`` - maximal age in seconds of the VCS packages before their version will be updated with its remote source, integer, optional, default is 7 days.
-* ``workers`` - list of worker nodes addresses used for build process, space separated list of strings, optional. Each worker address must be valid and reachable url, e.g. ``https://10.0.0.1:8080``. If none set, the build process will be run on the current node. There is also special trigger which loads this value based on the list of the discovered nodes.
+* ``workers`` - list of worker nodes addresses used for build process, space separated list of strings, optional. Each worker address must be valid and reachable URL, e.g. ``https://10.0.0.1:8080``. If none set, the build process will be run on the current node. There is also special trigger which loads this value based on the list of the discovered nodes.
 
 ``repository`` group
 --------------------
@@ -109,9 +110,9 @@ Settings for signing packages or repository. Group name can refer to architectur
 Reporting to web service related settings. In most cases there is fallback to web section settings.
 
 * ``enabled`` - enable reporting to web service, boolean, optional, default ``yes`` for backward compatibility.
-* ``address`` - remote web service address with protocol, string, optional. In case of websocket, the ``http+unix`` scheme and url encoded address (e.g. ``%2Fvar%2Flib%2Fahriman`` for ``/var/lib/ahriman``) must be used, e.g. ``http+unix://%2Fvar%2Flib%2Fahriman%2Fsocket``. In case if none set, it will be guessed from ``web`` section.
+* ``address`` - remote web service address with protocol, string, optional. In case of websocket, the ``http+unix`` scheme and URL encoded address (e.g. ``%2Fvar%2Flib%2Fahriman`` for ``/var/lib/ahriman``) must be used, e.g. ``http+unix://%2Fvar%2Flib%2Fahriman%2Fsocket``. In case if none set, it will be guessed from ``web`` section.
 * ``password`` - password to authorize in web service in order to update service status, string, required in case if authorization enabled.
-* ``suppress_http_log_errors`` - suppress http log errors, boolean, optional, default ``no``. If set to ``yes``, any http log errors (e.g. if web server is not available, but http logging is enabled) will be suppressed.
+* ``suppress_http_log_errors`` - suppress HTTP log errors, boolean, optional, default ``no``. If set to ``yes``, any HTTP log errors (e.g. if web server is not available, but HTTP logging is enabled) will be suppressed.
 * ``timeout`` - HTTP request timeout in seconds, integer, optional, default is ``30``.
 * ``username`` - username to authorize in web service in order to update service status, string, required in case if authorization enabled.
 
@@ -123,7 +124,7 @@ Web server settings. This feature requires ``aiohttp`` libraries to be installed
 * ``address`` - optional address in form ``proto://host:port`` (``port`` can be omitted in case of default ``proto`` ports), will be used instead of ``http://{host}:{port}`` in case if set, string, optional. This option is required in case if ``OAuth`` provider is used.
 * ``enable_archive_upload`` - allow to upload packages via HTTP (i.e. call of ``/api/v1/service/upload`` uri), boolean, optional, default ``no``.
 * ``host`` - host to bind, string, optional.
-* ``index_url`` - full url of the repository index page, string, optional.
+* ``index_url`` - full URL of the repository index page, string, optional.
 * ``max_body_size`` - max body size in bytes to be validated for archive upload, integer, optional. If not set, validation will be disabled.
 * ``port`` - port to bind, integer, optional.
 * ``service_only`` - disable status routes (including logs), boolean, optional, default ``no``.
@@ -145,10 +146,10 @@ Keyring generator plugin
 
 * ``type`` - type of the generator, string, optional, must be set to ``keyring-generator`` if exists.
 * ``description`` - keyring package description, string, optional, default is ``repo PGP keyring``, where ``repo`` is the repository name.
-* ``homepage`` - url to homepage location if any, string, optional.
+* ``homepage`` - URL to homepage location if any, string, optional.
 * ``license`` - list of licenses which are applied to this package, space separated list of strings, optional, default is ``Unlicense``.
 * ``package`` - keyring package name, string, optional, default is ``repo-keyring``, where ``repo`` is the repository name.
-* ``packagers`` - list of packagers keys, space separated list of strings, optional, if not set, the ``key_*`` options from ``sign`` group will be used.
+* ``packagers`` - list of packagers keys, space separated list of strings, optional, if not set, the user keys from database will be used.
 * ``revoked`` - list of revoked packagers keys, space separated list of strings, optional.
 * ``trusted`` - list of master keys, space separated list of strings, optional, if not set, the ``key`` option from ``sign`` group will be used.
 
@@ -164,7 +165,7 @@ Mirrorlist generator plugin
 
 * ``type`` - type of the generator, string, optional, must be set to ``mirrorlist-generator`` if exists.
 * ``description`` - mirrorlist package description, string, optional, default is ``repo mirror list for use by pacman``, where ``repo`` is the repository name.
-* ``homepage`` - url to homepage location if any, string, optional.
+* ``homepage`` - URL to homepage location if any, string, optional.
 * ``license`` - list of licenses which are applied to this package, space separated list of strings, optional, default is ``Unlicense``.
 * ``package`` - mirrorlist package name, string, optional, default is ``repo-mirrorlist``, where ``repo`` is the repository name.
 * ``path`` - absolute path to generated mirrorlist file, string, optional, default is ``/etc/pacman.d/repo-mirrorlist``, where ``repo`` is the repository name.
@@ -175,7 +176,7 @@ Mirrorlist generator plugin
 
 Remote git source synchronization settings. Unlike ``Upload`` triggers those triggers are used for PKGBUILD synchronization - fetch from remote repository PKGBUILDs before updating process.
 
-It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
+It supports authorization; to do so you'd need to prefix the URL with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
 
 * by SSH key: generate SSH key as ``ahriman`` user and put public part of it to the repository keys.
 * by git credentials helper: consult with the `related man page <https://git-scm.com/docs/gitcredentials>`__.
@@ -187,7 +188,7 @@ Available options are:
 Remote pull trigger
 ^^^^^^^^^^^^^^^^^^^
 
-* ``pull_url`` - url of the remote repository from which PKGBUILDs can be pulled before build process, string, required.
+* ``pull_url`` - URL of the remote repository from which PKGBUILDs can be pulled before build process, string, required.
 * ``pull_branch`` - branch of the remote repository from which PKGBUILDs can be pulled before build process, string, optional, default is ``master``.
 
 ``remote-push`` group
@@ -195,7 +196,7 @@ Remote pull trigger
 
 Remote git source synchronization settings. Same as remote pull triggers those triggers are used for PKGBUILD synchronization - push updated PKGBUILDs to the remote repository after build process.
 
-It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
+It supports authorization; to do so you'd need to prefix the URL with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
 
 * by SSH key: generate SSH key as ``ahriman`` user and put public part of it to the repository keys.
 * by git credentials helper: consult with the `related man page <https://git-scm.com/docs/gitcredentials>`__.
@@ -209,7 +210,7 @@ Remote push trigger
 
 * ``commit_email`` - git commit email, string, optional, default is ``ahriman@localhost``.
 * ``commit_user`` - git commit user, string, optional, default is ``ahriman``.
-* ``push_url`` - url of the remote repository to which PKGBUILDs should be pushed after build process, string, required.
+* ``push_url`` - URL of the remote repository to which PKGBUILDs should be pushed after build process, string, required.
 * ``push_branch`` - branch of the remote repository to which PKGBUILDs should be pushed after build process, string, optional, default is ``master``.
 
 ``report`` group

docs/faq.rst

@@ -174,7 +174,7 @@ For that purpose you could use ``RemotePullTrigger`` trigger. To do so you will
    [gitremote]
    pull_url = https://github.com/username/repository
 
-During the next application run it will fetch repository from the specified url and will try to find packages there which can be used as local sources.
+During the next application run it will fetch repository from the specified URL and will try to find packages there which can be used as local sources.
 
 This feature can be also used to build packages which are not listed in AUR, the example of the feature use can be found `here <https://github.com/arcan1s/ahriman/tree/master/recipes/pull>`__.
 
@@ -191,7 +191,7 @@ For that purpose you'd need to use another trigger called ``RemotePushTrigger``.
    [gitremote]
    push_url = https://github.com/username/repository
 
-Unlike ``RemotePullTrigger`` trigger, the ``RemotePushTrigger`` more likely will require authorization. It is highly recommended to use application tokens for that instead of using your password (e.g. for GitHub you can generate tokens `here <https://github.com/settings/tokens>`__ with scope ``public_repo``). Authorization can be supplied by using authorization part of the url, e.g. ``https://key:token@github.com/username/repository``.
+Unlike ``RemotePullTrigger`` trigger, the ``RemotePushTrigger`` more likely will require authorization. It is highly recommended to use application tokens for that instead of using your password (e.g. for GitHub you can generate tokens `here <https://github.com/settings/tokens>`__ with scope ``public_repo``). Authorization can be supplied by using authorization part of the URL, e.g. ``https://key:token@github.com/username/repository``.
 
 How to change PKGBUILDs before build
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -461,7 +461,7 @@ The following environment variables are supported:
 * ``AHRIMAN_POSTSETUP_COMMAND`` - if set, the command which will be called (as root) after the setup command, but before any other actions.
 * ``AHRIMAN_PRESETUP_COMMAND`` - if set, the command which will be called (as root) right before the setup command.
 * ``AHRIMAN_REPOSITORY`` - repository name, default is ``aur-clone``.
-* ``AHRIMAN_REPOSITORY_SERVER`` - optional override for the repository url. Useful if you would like to download packages from remote instead of local filesystem.
+* ``AHRIMAN_REPOSITORY_SERVER`` - optional override for the repository URL. Useful if you would like to download packages from remote instead of local filesystem.
 * ``AHRIMAN_REPOSITORY_ROOT`` - repository root. Because of filesystem rights it is required to override default repository root. By default, it uses ``ahriman`` directory inside ahriman's home, which can be passed as mount volume.
 * ``AHRIMAN_UNIX_SOCKET`` - full path to unix socket which is used by web server, default is empty. Note that more likely you would like to put it inside ``AHRIMAN_REPOSITORY_ROOT`` directory (e.g. ``/var/lib/ahriman/ahriman/ahriman-web.sock``) or to ``/tmp``.
 * ``AHRIMAN_USER`` - ahriman user, usually must not be overwritten, default is ``ahriman``.

docs/triggers.rst

@@ -49,7 +49,7 @@ Generator for keyring package. This trigger will extract keys from local keychai
 ``ahriman.core.support.MirrorlistTrigger``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Simple generator for mirrorlist package, based on the urls which were set by configuration. This trigger will generate sources including PKGBUILD, which can be used later for package building.
+Simple generator for mirrorlist package, based on the URLs which were set by configuration. This trigger will generate sources including PKGBUILD, which can be used later for package building.
 
 ``ahriman.core.upload.UploadTrigger``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -95,7 +95,7 @@ Trigger example
 
 Lets consider example of reporting trigger (e.g. `slack <https://slack.com/>`__, which provides easy HTTP API for integration triggers).
 
-In order to post message to slack we will need a specific trigger url (something like ``https://hooks.slack.com/services/company_id/trigger_id``), channel (e.g. ``#archrepo``) and username (``repo-bot``).
+In order to post message to slack we will need a specific trigger URL (something like ``https://hooks.slack.com/services/company_id/trigger_id``), channel (e.g. ``#archrepo``) and username (``repo-bot``).
 
 As it has been mentioned, our trigger must derive from specific class:
 

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.12.2
+pkgver=2.13.6
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

package/share/ahriman/settings/ahriman.ini

@@ -1,85 +1,356 @@
 [settings]
+; Relative path to directory with configuration files overrides. Overrides will be applied in alphabetic order.
 include = ahriman.ini.d
+; Relative path to configuration used by logging package.
 logging = ahriman.ini.d/logging.ini
-apply_migrations = yes
+; Perform database migrations on the application start. Do not touch this option unless you know what are you doing.
+;apply_migrations = yes
+; Path to the application SQLite database.
 database = /var/lib/ahriman/ahriman.db
 
 [alpm]
+; Path to pacman system database cache.
 database = /var/lib/pacman
+; Arch linux mirror used by local pacman for synchronization.
 mirror = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+; Space separated list of pacman repositories to search for packages.
 repositories = core extra multilib
+; Pacman's root directory. In the most cases it must point to the system root.
 root = /
+; Use local packages cache. If this option is enabled, the service will be able to synchronize databases (available
+; as additional option for some subcommands). If set to no, databases must be synchronized manually.
 use_ahriman_cache = yes
 
 [auth]
+; Authentication provider, must be one of disabled, configuration, oauth.
 target = disabled
-max_age = 604800
-oauth_provider = GoogleClient
-oauth_scopes = https://www.googleapis.com/auth/userinfo.email
+; Allow read-only endpoint to be called without authentication.
 allow_read_only = yes
+; OAuth2 application client ID and secret. Required if oauth is used.
+;client_id =
+;client_secret =
+; Cookie secret key to be used for cookies encryption. Must be valid 32 bytes URL-safe base64-encoded string.
+; If not set, it will be generated automatically.
+;cookie_secret_key =
+; Authentication cookie expiration in seconds.
+;max_age = 604800
+; OAuth2 provider icon for the web interface.
+;oauth_icon = google
+; OAuth2 provider class name, one of provided by aioauth-client. Required if oauth is used.
+;oauth_provider = GoogleClient
+; Scopes list for OAuth2 provider. Required if oauth is used.
+;oauth_scopes = https://www.googleapis.com/auth/userinfo.email
+; Optional password salt.
+;salt =
 
 [build]
-archbuild_flags =
-ignore_packages =
-makechrootpkg_flags =
+; List of additional flags passed to archbuild command.
+;archbuild_flags =
+; Path to build command
+;build_command =
+; List of packages to be ignored during automatic updates.
+;ignore_packages =
+; Include debug packages
+;include_debug_packages = yes
+; List of additional flags passed to makechrootpkg command.
+;makechrootpkg_flags =
+; List of additional flags passed to makepkg command.
 makepkg_flags = --nocolor --ignorearch
+; List of enabled triggers in the order of calls.
 triggers = ahriman.core.gitremote.RemotePullTrigger ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger ahriman.core.gitremote.RemotePushTrigger
+; List of well-known triggers. Used only for configuration purposes.
 triggers_known = ahriman.core.distributed.WorkerLoaderTrigger ahriman.core.distributed.WorkerRegisterTrigger ahriman.core.distributed.WorkerTrigger ahriman.core.distributed.WorkerUnregisterTrigger ahriman.core.gitremote.RemotePullTrigger ahriman.core.gitremote.RemotePushTrigger ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger ahriman.core.support.KeyringTrigger ahriman.core.support.MirrorlistTrigger
-vcs_allowed_age = 604800
+; Maximal age in seconds of the VCS packages before their version will be updated with its remote source.
+;vcs_allowed_age = 604800
+; 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 =
 
 [repository]
+; Application root.
 root = /var/lib/ahriman
 
 [sign]
+; Enable repository or package signing. Must be one of repository, package.
 target =
-
-[keyring]
-target =
-
-[mirrorlist]
-target =
-
-[remote-pull]
-target =
-
-[remote-push]
-target =
-
-[report]
-target = console
-
-[console]
-use_utf = yes
-
-[email]
-no_empty_report = yes
-template = email-index.jinja2
-templates = /usr/share/ahriman/templates
-ssl = disabled
-
-[html]
-template = repo-index.jinja2
-templates = /usr/share/ahriman/templates
+; PGP key used for signing as default.
+;key =
 
 [status]
+; Global switch to enable or disable status reporting.
 enabled = yes
+; Address of the remote service, e.g.:
+;     address = http://1.0.0.1:8080
+; In case if unix sockets are used, it might point to the valid socket with encoded path, e.g.:
+;     address = http+unix://%2Fvar%2Flib%2Fahriman%2Fsocket
+;address =
+; Optional password for authentication (if enabled).
+;password =
+; Do not log HTTP errors if occurs.
 suppress_http_log_errors = yes
-
-[telegram]
-template = telegram-index.jinja2
-templates = /usr/share/ahriman/templates
-
-[upload]
-target =
-
-[rsync]
-command = rsync --archive --compress --partial --delete
-
-[s3]
-chunk_size = 8388608
+; HTTP request timeout in seconds.
+;timeout = 30
+; Optional username for authentication (if enabled).
+;username =
 
 [web]
+; External address of the web service. Will be used for some features like OAuth. If none set will be generated as
+;     address = http://web.host:web.port
+;address =
+; Enable file upload endpoint used by some triggers.
+;enable_archive_upload = no
+; Address to bind the server.
 host = 127.0.0.1
+; Full URL to the repository index page used by templates.
+;index_url =
+; Max file size in bytes which can be uploaded to the server.
+;max_body_size =
+; Port to listen. Must be set, if the web service is enabled.
+;port =
+; Disable status (e.g. package status, logs, etc) endpoints. Useful for build only modes.
+;service_only = no
+; Path to directory with static files.
 static_path = /usr/share/ahriman/templates/static
+; List of directories with templates.
 templates = /usr/share/ahriman/templates
-unix_socket_unsafe = yes
+; Path to unix socket. If none set, unix socket will be disabled.
+;unix_socket =
+; Allow unix socket to be world readable.
+;unix_socket_unsafe = yes
+; Maximum amount of time in seconds to be waited before lock will be free, used by spawned processes (0 is infinite).
+;wait_timeout =
+
+[keyring]
+; List of configuration section names for keyring generator plugin, e.g.:
+;     target = keyring-trigger
+target =
+
+; Keyring generator trigger sample.
+;[keyring-trigger]
+; Generator type name.
+;type = keyring-generator
+; Optional keyring package description.
+;description=
+; Optional URL to the repository homepage.
+;homepage=
+; Keyring package licenses list.
+;license = Unlicense
+; Optional keyring package name.
+;package =
+; Optional packager PGP keys list. If none set, it will read from database.
+;packagers =
+; List of revoked PGP keys.
+;revoked =
+; List of master PGP keys. If none set, the sign.key value will be used.
+;trusted =
+
+[mirrorlist]
+; List of configuration section names for mirrorlist generator plugin, e.g.:
+;     target = mirrorlist-trigger
+target =
+
+; Mirror list generator trigger sample.
+;[mirrorlist-trigger]
+; Generator type name.
+;type = mirrorlist-generator
+; Optional mirrorlist package description.
+;description=
+; Optional URL to the repository homepage.
+;homepage=
+; Mirrorlist package licenses list.
+;license = Unlicense
+; Optional mirrorlist package name.
+;package =
+; Absolute path to generated mirrorlist file, usually path inside /etc/pacman.d directory.
+;path =
+; List of repository mirrors.
+;servers =
+
+[remote-pull]
+; List of configuration section names for git remote pull plugin, e.g.:
+;     target = remote-pull-trigger
+target =
+
+; git remote pull trigger sample.
+;[remote-pull-trigger]
+; Valid URL to pull repository, e.g.:
+;     pull_url = https://github.com/arcan1s/arcanisrepo.git
+;pull_url =
+; Remote branch to pull.
+;pull_branch = master
+
+[remote-push]
+; List of configuration section names for git remote push plugin, e.g.:
+;     target = remote-push-trigger
+target =
+
+; git remote push trigger sample.
+;[remote-push-trigger]
+; Author commit email.
+;commit_email = ahriman@localhost
+; Author commit user.
+;commit_user = ahriman
+; Valid URL to push repository, e.g.:
+;     push_url = https://key:token@github.com/arcan1s/arcanisrepo.git
+; Note, that more likely authentication must be enabled.
+;push_url =
+; Remote branch to push.
+;push_branch = master
+
+[report]
+; List of configuration section names for reporting plugin.
+target = console
+
+; Console reporting trigger configuration sample.
+[console]
+; Trigger type name
+;type = console
+; Use utf8 symbols in output.
+use_utf = yes
+
+; Email reporting trigger configuration sample.
+[email]
+; Trigger type name
+;type = email
+; Optional URL to the repository homepage.
+;homepage=
+; SMTP server address.
+;host =
+; Prefix for packages links. Link to a package will be formed as link_path / filename.
+;link_path =
+; Skip report generation if no packages were updated.
+;no_empty_report = yes
+; SMTP password.
+;password =
+; SMTP server port.
+;port =
+; List of emails to receive the reports.
+;receivers =
+; Sender email.
+;sender =
+; SMTP server SSL mode, one of ssl, starttls, disabled.
+;ssl = disabled
+; Template name to be used.
+template = email-index.jinja2
+; Template name to be used for full packages list generation (same as HTML report).
+;template_full =
+; List of directories with templates.
+templates = /usr/share/ahriman/templates
+; SMTP user.
+;user =
+
+; HTML reporting trigger configuration sample.
+[html]
+; Trigger type name
+;type = html
+; Optional URL to the repository homepage.
+;homepage=
+; Prefix for packages links. Link to a package will be formed as link_path / filename.
+;link_path =
+; Output path for the HTML report.
+;path =
+; Template name to be used.
+template = repo-index.jinja2
+; List of directories with templates.
+templates = /usr/share/ahriman/templates
+
+; Remote service callback trigger configuration sample.
+[remote-call]
+; Trigger type name
+;type = remote-call
+; Call for AUR packages update.
+;aur = no
+; Call for local packages update.
+;local = no
+; Call for manual packages update.
+;manual = no
+; Wait until remote process will be terminated in seconds.
+;wait_timeout = -1
+
+; Telegram reporting trigger configuration sample.
+[telegram]
+; Trigger type name
+;type = telegram
+; Telegram bot API key.
+;api_key =
+; Telegram chat ID.
+;chat_id =
+; Optional URL to the repository homepage.
+;homepage=
+; Prefix for packages links. Link to a package will be formed as link_path / filename.
+;link_path =
+; Template name to be used.
+template = telegram-index.jinja2
+; Telegram specific template mode, one of MarkdownV2, HTML or Markdown.
+;template_type = HTML
+; List of directories with templates.
+templates = /usr/share/ahriman/templates
+; HTTP request timeout in seconds.
+;timeout = 30
+
+[upload]
+; List of configuration section names for remote upload plugin, e.g.:
+;     target = rsync s3
+target =
+
+; GitHub upload trigger configuration sample.
+[github]
+; Trigger type name
+;type = github
+; GitHub repository owner username.
+;owner =
+; GitHub API key. public_repo (repo) scope is required.
+;password =
+; GitHub repository name.
+;repository =
+; HTTP request timeout in seconds.
+;timeout = 30
+; Include repository name to release name (recommended).
+;use_full_release_name = no
+; GitHub authentication username.
+;username =
+
+; Remote instance upload trigger configuration sample.
+[remote-service]
+; Trigger type name
+;type = remote-service
+; HTTP request timeout in seconds.
+;timeout = 30
+
+; rsync upload trigger configuration sample.
+[rsync]
+; Trigger type name
+;type = rsync
+; rsync command to run.
+command = rsync --archive --compress --partial --delete
+; Remote address and directory to sync, e.g.:
+;     remote = ahriman@10.0.0.1:/srv/repo
+;remote =
+
+; S3 upload trigger configuration sample.
+[s3]
+; Trigger type name
+;type = s3
+; AWS services access key.
+;access_key =
+; AWS S3 bucket name.
+;bucket =
+; Chunk size tp calculate ETags. Do not edit this value.
+;chunk_size = 8388608
+; Optional path prefix for stored objects.
+;object_path =
+; AWS S3 bucket region.
+;region =
+; AWS services secret key.
+;secret_key =
+
+; Remote worker configuration sample.
+;[worker]
+; Remotely reachable address of this instance, e.g.:
+;     address = http://10.0.0.1:8080
+;address =
+; Unique identifier of this instance if any.
+;identifier =
+; Maximum amount of time in seconds after which worker will be considered offline in case of no reports.
+;time_to_live = 60

package/share/ahriman/settings/ahriman.ini.d/logging.ini

@@ -36,7 +36,7 @@ level = DEBUG
 qualname = root
 
 [logger_http]
-level = DEBUG
+level = WARNING
 qualname = http
 propagate = 0
 

package/share/ahriman/templates/build-status.jinja2

@@ -15,7 +15,7 @@
 
         <div class="container">
             <nav class="navbar navbar-expand-lg">
-                <div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""> ahriman</div>
+                <div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""></div>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#repositories-navbar-supported-content" aria-controls="repositories-navbar-supported-content" aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>

package/share/ahriman/templates/build-status/key-import-modal.jinja2

@@ -38,10 +38,6 @@
 <script>
     const keyImportModal = $("#key-import-modal");
     const keyImportForm = $("#key-import-form");
-    keyImportModal.on("hidden.bs.modal", () => {
-        keyImportBodyInput.text("");
-        keyImportForm.trigger("reset");
-    });
 
     const keyImportBodyInput = $("#key-import-body-input");
     const keyImportCopyButton = $("#key-import-copy-button");
@@ -90,4 +86,11 @@
             });
         }
     }
+
+    $(() => {
+        keyImportModal.on("hidden.bs.modal", () => {
+            keyImportBodyInput.text("");
+            keyImportForm.trigger("reset");
+        });
+    });
 </script>

package/share/ahriman/templates/build-status/login-modal.jinja2

@@ -36,9 +36,6 @@
 <script>
     const loginModal = $("#login-modal");
     const loginForm = $("#login-form");
-    loginModal.on("hidden.bs.modal", () => {
-        loginForm.trigger("reset");
-    });
 
     const loginPasswordInput = $("#login-password");
     const loginUsernameInput = $("#login-username");
@@ -77,4 +74,10 @@
             showHidePasswordButton.addClass("bi-eye");
         }
     }
+
+    $(() => {
+        loginModal.on("hidden.bs.modal", () => {
+            loginForm.trigger("reset");
+        });
+    });
 </script>

package/share/ahriman/templates/build-status/package-add-modal.jinja2

@@ -43,41 +43,10 @@
 <script>
     const packageAddModal = $("#package-add-modal");
     const packageAddForm = $("#package-add-form");
-    packageAddModal.on("shown.bs.modal", () => {
-        $(`#package-add-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
-    });
-    packageAddModal.on("hidden.bs.modal", () => {
-        packageAddVariablesDiv.empty();
-        packageAddForm.trigger("reset");
-    });
 
     const packageAddInput = $("#package-add-input");
     const packageAddRepositoryInput = $("#package-add-repository-input");
     const packageAddKnownPackagesList = $("#package-add-known-packages-dlist");
-    packageAddInput.keyup(() => {
-        clearTimeout(packageAddInput.data("timeout"));
-        packageAddInput.data("timeout", setTimeout($.proxy(() => {
-            const value = packageAddInput.val();
-
-            if (value.length >= 3) {
-                $.ajax({
-                    url: "/api/v1/service/search",
-                    data: {"for": value},
-                    type: "GET",
-                    dataType: "json",
-                    success: response => {
-                        const options = response.map(pkg => {
-                            const option = document.createElement("option");
-                            option.value = pkg.package;
-                            option.innerText = `${pkg.package} (${pkg.description})`;
-                            return option;
-                        });
-                        packageAddKnownPackagesList.empty().append(options);
-                    },
-                });
-            }
-        }, this), 500));
-    });
 
     const packageAddVariablesDiv = $("#package-add-variables-div");
 
@@ -156,4 +125,39 @@
             doPackageAction("/api/v1/service/request", [packages], repository, onSuccess, onFailure, patches);
         }
     }
+
+    $(() => {
+        packageAddModal.on("shown.bs.modal", () => {
+            $(`#package-add-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
+        });
+        packageAddModal.on("hidden.bs.modal", () => {
+            packageAddVariablesDiv.empty();
+            packageAddForm.trigger("reset");
+        });
+
+        packageAddInput.keyup(() => {
+            clearTimeout(packageAddInput.data("timeout"));
+            packageAddInput.data("timeout", setTimeout($.proxy(() => {
+                const value = packageAddInput.val();
+
+                if (value.length >= 3) {
+                    $.ajax({
+                        url: "/api/v1/service/search",
+                        data: {"for": value},
+                        type: "GET",
+                        dataType: "json",
+                        success: response => {
+                            const options = response.map(pkg => {
+                                const option = document.createElement("option");
+                                option.value = pkg.package;
+                                option.innerText = `${pkg.package} (${pkg.description})`;
+                                return option;
+                            });
+                            packageAddKnownPackagesList.empty().append(options);
+                        },
+                    });
+                }
+            }, this), 500));
+        });
+    });
 </script>

package/share/ahriman/templates/build-status/package-info-modal.jinja2

@@ -72,26 +72,6 @@
     const packageInfoModal = $("#package-info-modal");
     const packageInfoModalHeader = $("#package-info-modal-header");
     const packageInfo = $("#package-info");
-    packageInfoModal.on("hidden.bs.modal", () => {
-        packageInfoAurUrl.empty();
-        packageInfoDepends.empty();
-        packageInfoGroups.empty();
-        packageInfoLicenses.empty();
-        packageInfoPackager.empty();
-        packageInfoPackages.empty();
-        packageInfoUpstreamUrl.empty();
-        packageInfoVersion.empty();
-
-        packageInfoVariablesBlock.attr("hidden", true);
-        packageInfoVariablesDiv.empty();
-
-        packageInfoLogsInput.empty();
-        packageInfoChangesInput.empty();
-
-        packageInfoModal.trigger("reset");
-
-        hideInfoControls(true);
-    });
 
     const packageInfoLogsInput = $("#package-info-logs-input");
     const packageInfoLogsCopyButton = $("#package-info-logs-copy-button");
@@ -309,4 +289,27 @@
 
         if (isPackageBaseSet) packageInfoModal.modal("show");
     }
+
+    $(() => {
+        packageInfoModal.on("hidden.bs.modal", () => {
+            packageInfoAurUrl.empty();
+            packageInfoDepends.empty();
+            packageInfoGroups.empty();
+            packageInfoLicenses.empty();
+            packageInfoPackager.empty();
+            packageInfoPackages.empty();
+            packageInfoUpstreamUrl.empty();
+            packageInfoVersion.empty();
+
+            packageInfoVariablesBlock.attr("hidden", true);
+            packageInfoVariablesDiv.empty();
+
+            packageInfoLogsInput.empty();
+            packageInfoChangesInput.empty();
+
+            packageInfoModal.trigger("reset");
+
+            hideInfoControls(true);
+        });
+    });
 </script>

package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2

@@ -35,11 +35,6 @@
 <script>
     const packageRebuildModal = $("#package-rebuild-modal");
     const packageRebuildForm = $("#package-rebuild-form");
-    packageRebuildModal.on("shown.bs.modal", () => {
-        $(`#package-rebuild-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
-
-    });
-    packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
 
     const packageRebuildDependencyInput = $("#package-rebuild-dependency-input");
     const packageRebuildRepositoryInput = $("#package-rebuild-repository-input");
@@ -54,4 +49,12 @@
             doPackageAction("/api/v1/service/rebuild", [packages], repository, onSuccess, onFailure);
         }
     }
+
+    $(() => {
+        packageRebuildModal.on("shown.bs.modal", () => {
+            $(`#package-rebuild-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
+
+        });
+        packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
+    });
 </script>

package/share/ahriman/templates/build-status/table.jinja2

@@ -9,46 +9,8 @@
     const packageInfoUpdateButton = $("#package-info-update-button");
 
     let repository = null;
-    $("#repositories a").on("click", (event) => {
-        const element = event.target;
-        repository = {
-            architecture: element.dataset.architecture,
-            repository: element.dataset.repository,
-        };
-        packageUpdateButton.html(`<i class="bi bi-play"></i> update<span class="d-none d-sm-inline"> ${safe(repository.repository)} (${safe(repository.architecture)})</span>`);
-        $(`#${element.id}`).tab("show");
-        reload();
-    });
 
     const table = $("#packages");
-    table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
-        packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
-    });
-    table.on("click-row.bs.table", (self, data, row, cell) => {
-        if (0 === cell || "base" === cell) {
-            const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
-            table.bootstrapTable(method, {field: "id", values: [data.id]});
-        } else showPackageInfo(data.id);
-    });
-    table.on("created-controls.bs.table", () => {
-        const pickerInput = $(".bootstrap-table-filter-control-timestamp");
-        pickerInput.daterangepicker({
-            autoUpdateInput: false,
-            locale: {
-                cancelLabel: "Clear",
-            },
-        });
-
-        pickerInput.on("apply.daterangepicker", (event, picker) => {
-            pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
-            table.bootstrapTable("triggerSearch");
-        });
-
-        pickerInput.on("cancel.daterangepicker", () => {
-            pickerInput.val("");
-            table.bootstrapTable("triggerSearch");
-        });
-    });
 
     const statusBadge = $("#badge-status");
     const versionBadge = $("#badge-version");
@@ -221,8 +183,47 @@
     }
 
     $(() => {
-        table.bootstrapTable({});
+        $("#repositories a").on("click", event => {
+            const element = event.target;
+            repository = {
+                architecture: element.dataset.architecture,
+                repository: element.dataset.repository,
+            };
+            packageUpdateButton.html(`<i class="bi bi-play"></i> update<span class="d-none d-sm-inline"> ${safe(repository.repository)} (${safe(repository.architecture)})</span>`);
+            $(`#${element.id}`).tab("show");
+            reload();
+        });
+
+        table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
+            packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
+        });
+        table.on("click-row.bs.table", (self, data, row, cell) => {
+            if (0 === cell || "base" === cell) {
+                const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
+                table.bootstrapTable(method, {field: "id", values: [data.id]});
+            } else showPackageInfo(data.id);
+        });
+        table.on("created-controls.bs.table", () => {
+            const pickerInput = $(".bootstrap-table-filter-control-timestamp");
+            pickerInput.daterangepicker({
+                autoUpdateInput: false,
+                locale: {
+                    cancelLabel: "Clear",
+                },
+            });
+
+            pickerInput.on("apply.daterangepicker", (event, picker) => {
+                pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
+                table.bootstrapTable("triggerSearch");
+            });
+
+            pickerInput.on("cancel.daterangepicker", () => {
+                pickerInput.val("");
+                table.bootstrapTable("triggerSearch");
+            });
+        });
+
         statusBadge.popover();
         selectRepository();
     });
-</script>
+</script>

package/share/ahriman/templates/repo-index.jinja2

@@ -102,25 +102,6 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
 
         <script>
             const table = $("#packages");
-            table.on("created-controls.bs.table", () => {
-                const pickerInput = $(".bootstrap-table-filter-control-timestamp");
-                pickerInput.daterangepicker({
-                    autoUpdateInput: false,
-                    locale: {
-                        cancelLabel: "Clear",
-                    },
-                });
-
-                pickerInput.on("apply.daterangepicker", (event, picker) => {
-                    pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
-                    table.bootstrapTable("triggerSearch");
-                });
-
-                pickerInput.on("cancel.daterangepicker", () => {
-                    pickerInput.val("");
-                    table.bootstrapTable("triggerSearch");
-                });
-            });
 
             const pacmanConf = $("#pacman-conf");
             const pacmanConfCopyButton = $("#copy-btn");
@@ -141,6 +122,28 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
             function filterListLicenses() {
                 return extractDataList(table.bootstrapTable("getData"), "licenses");
             }
+
+            $(() => {
+                table.on("created-controls.bs.table", () => {
+                    const pickerInput = $(".bootstrap-table-filter-control-timestamp");
+                    pickerInput.daterangepicker({
+                        autoUpdateInput: false,
+                        locale: {
+                            cancelLabel: "Clear",
+                        },
+                    });
+
+                    pickerInput.on("apply.daterangepicker", (event, picker) => {
+                        pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
+                        table.bootstrapTable("triggerSearch");
+                    });
+
+                    pickerInput.on("cancel.daterangepicker", () => {
+                        pickerInput.val("");
+                        table.bootstrapTable("triggerSearch");
+                    });
+                });
+            });
         </script>
 
     </body>

package/share/ahriman/templates/utils/bootstrap-scripts.jinja2

@@ -1,7 +1,7 @@
 <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js" integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs" crossorigin="anonymous" type="application/javascript"></script>
 
-<script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js" integrity="sha384-8hHkOkbWN1TLWwet/jpbJ0zbx3FJDeYJgQ8dX1mRrv/vfCfHCqFSFZYCgaMML3z9" crossorigin="anonymous" type="application/javascript"></script>
-<script src="https://cdn.jsdelivr.net/npm/daterangepicker@3.1.0/daterangepicker.min.js" integrity="sha384-u4eJN1VWrTf/FnYYQJo2kqJyVxEQf5UmWY4iUcNAoLenOEtEuCkfwc5bKvZOWBi5" crossorigin="anonymous" type="application/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js" integrity="sha384-4ZTAzTbfB8H7hkWtXbyNDzDvxirmBT7EmURIvfOJ3Foympc+OD9p+bZNNENaJXgW" crossorigin="anonymous" type="application/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/daterangepicker@3.1.0/daterangepicker.min.js" integrity="sha384-Gn1XZMJEKL3ycoWq97jYAl+FP3vXQYE2ObBgzgcPMKOZdUZdF6ZuyUxbGC2bAnUT" crossorigin="anonymous" type="application/javascript"></script>
 
 <script src="https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js" integrity="sha384-1Rz4Kz/y1rSWw+ZsjTcxB684XgofbO8iizY+UFIzCwFeQ+QUyhBNWBMh/STOyomI" crossorigin="anonymous" type="application/javascript"></script>
 

package/share/bash-completion/completions/_ahriman

@@ -584,7 +584,7 @@ _set_new_action() {
     current_action_nargs=1
   fi
 
-  current_action_args_start_index=$(( $word_index + 1 ))
+  current_action_args_start_index=$(( $word_index + 1 - $pos_only ))
 
   current_action_is_positional=$2
 }
@@ -611,6 +611,7 @@ _shtab_ahriman() {
 
   local prefix=_shtab_ahriman
   local word_index=0
+  local pos_only=0 # "--" delimeter not encountered yet
   _set_parser_defaults
   word_index=1
 
@@ -619,26 +620,30 @@ _shtab_ahriman() {
   while [ $word_index -ne $COMP_CWORD ]; do
     local this_word="${COMP_WORDS[$word_index]}"
 
-    if [[ -n $sub_parsers && " ${sub_parsers[@]} " == *" ${this_word} "* ]]; then
-      # valid subcommand: add it to the prefix & reset the current action
-      prefix="${prefix}_$(_shtab_replace_nonword $this_word)"
-      _set_parser_defaults
-    fi
+    if [[ $pos_only = 1 || " $this_word " != " -- " ]]; then
+      if [[ -n $sub_parsers && " ${sub_parsers[@]} " == *" ${this_word} "* ]]; then
+        # valid subcommand: add it to the prefix & reset the current action
+        prefix="${prefix}_$(_shtab_replace_nonword $this_word)"
+        _set_parser_defaults
+      fi
 
-    if [[ " ${current_option_strings[@]} " == *" ${this_word} "* ]]; then
-      # a new action should be acquired (due to recognised option string or
-      # no more input expected from current action);
-      # the next positional action can fill in here
-      _set_new_action $this_word false
-    fi
+      if [[ " ${current_option_strings[@]} " == *" ${this_word} "* ]]; then
+        # a new action should be acquired (due to recognised option string or
+        # no more input expected from current action);
+        # the next positional action can fill in here
+        _set_new_action $this_word false
+      fi
 
-    if [[ "$current_action_nargs" != "*" ]] && \
-       [[ "$current_action_nargs" != "+" ]] && \
-       [[ "$current_action_nargs" != *"..." ]] && \
-       (( $word_index + 1 - $current_action_args_start_index >= \
-          $current_action_nargs )); then
-      $current_action_is_positional && let "completed_positional_actions += 1"
-      _set_new_action "pos_${completed_positional_actions}" true
+      if [[ "$current_action_nargs" != "*" ]] && \
+         [[ "$current_action_nargs" != "+" ]] && \
+         [[ "$current_action_nargs" != *"..." ]] && \
+         (( $word_index + 1 - $current_action_args_start_index - $pos_only >= \
+            $current_action_nargs )); then
+        $current_action_is_positional && let "completed_positional_actions += 1"
+        _set_new_action "pos_${completed_positional_actions}" true
+      fi
+    else
+      pos_only=1 # "--" delimeter encountered
     fi
 
     let "word_index+=1"
@@ -646,7 +651,7 @@ _shtab_ahriman() {
 
   # Generate the completions
 
-  if [[ "${completing_word}" == -* ]]; then
+  if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
     # optional argument started: use option strings
     COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
   else

package/share/man/man1/ahriman.1

@@ -1,4 +1,4 @@
-.TH AHRIMAN "1" "2024\-01\-02" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2024\-05\-05" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .SH SYNOPSIS

package/share/zsh/site-functions/_ahriman

@@ -736,4 +736,12 @@ _shtab_ahriman() {
 
 
 typeset -A opt_args
-_shtab_ahriman "$@"
+
+if [[ $zsh_eval_context[-1] == eval ]]; then
+  # eval/source/. command, register function for later
+  compdef _shtab_ahriman -N ahriman
+else
+  # autoload from fpath, call function directly
+  _shtab_ahriman "$@"
+fi
+

pylint_plugins/definition_order.py

@@ -25,19 +25,19 @@ from pylint.lint import PyLinter
 from typing import Any
 
 
-class MethodTypeOrder(StrEnum):
+class MethodType(StrEnum):
     """
     method type enumeration
 
     Attributes:
-        Class(MethodTypeOrder): (class attribute) class method
-        Delete(MethodTypeOrder): (class attribute) destructor-like methods
-        Init(MethodTypeOrder): (class attribute) initialization method
-        Magic(MethodTypeOrder): (class attribute) other magical methods
-        New(MethodTypeOrder): (class attribute) constructor method
-        Normal(MethodTypeOrder): (class attribute) usual method
-        Property(MethodTypeOrder): (class attribute) property method
-        Static(MethodTypeOrder): (class attribute) static method
+        Class(MethodType): (class attribute) class method
+        Delete(MethodType): (class attribute) destructor-like methods
+        Init(MethodType): (class attribute) initialization method
+        Magic(MethodType): (class attribute) other magical methods
+        New(MethodType): (class attribute) constructor method
+        Normal(MethodType): (class attribute) usual method
+        Property(MethodType): (class attribute) property method
+        Static(MethodType): (class attribute) static method
     """
 
     Class = "classmethod"
@@ -59,20 +59,20 @@ class DefinitionOrder(BaseRawFileChecker):
     """
 
     DECORATED_METHODS_ORDER = {
-        "cached_property": MethodTypeOrder.Property,
-        "classmethod": MethodTypeOrder.Class,
-        "property": MethodTypeOrder.Property,
-        "staticmethod": MethodTypeOrder.Static,
+        "cached_property": MethodType.Property,
+        "classmethod": MethodType.Class,
+        "property": MethodType.Property,
+        "staticmethod": MethodType.Static,
     }
 
-    name = "method-ordering"
     msgs = {
         "W6001": (
             "Invalid method order %s, expected %s",
             "methods-out-of-order",
             "Methods are defined out of recommended order.",
-        )
+        ),
     }
+    name = "method-ordering"
     options = (
         (
             "method-type-order",
@@ -114,7 +114,7 @@ class DefinitionOrder(BaseRawFileChecker):
         return list(filter(is_defined_function, source))
 
     @staticmethod
-    def resolve_type(function: nodes.FunctionDef) -> MethodTypeOrder:
+    def resolve_type(function: nodes.FunctionDef) -> MethodType:
         """
         resolve type of the function
 
@@ -122,15 +122,15 @@ class DefinitionOrder(BaseRawFileChecker):
             function(nodes.FunctionDef): function definition
 
         Returns:
-            MethodTypeOrder: resolved function type
+            MethodType: resolved function type
         """
         # init methods
         if function.name in ("__init__", "__post_init__"):
-            return MethodTypeOrder.Init
+            return MethodType.Init
         if function.name in ("__new__",):
-            return MethodTypeOrder.New
+            return MethodType.New
         if function.name in ("__del__",):
-            return MethodTypeOrder.Delete
+            return MethodType.Delete
 
         # decorated methods
         decorators = []
@@ -142,10 +142,10 @@ class DefinitionOrder(BaseRawFileChecker):
 
         # magic methods
         if function.name.startswith("__") and function.name.endswith("__"):
-            return MethodTypeOrder.Magic
+            return MethodType.Magic
 
         # normal method
-        return MethodTypeOrder.Normal
+        return MethodType.Normal
 
     def check_class(self, clazz: nodes.ClassDef) -> None:
         """
@@ -184,7 +184,7 @@ class DefinitionOrder(BaseRawFileChecker):
         try:
             function_type_index = self.linter.config.method_type_order.index(function_type)
         except ValueError:
-            function_type_index = 10  # not in the list
+            function_type_index = len(self.linter.config.method_type_order)  # not in the list
 
         return function_type_index, function.name
 

pylint_plugins/import_order.py

@@ -0,0 +1,196 @@
+#
+# Copyright (c) 2021-2023 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from astroid import nodes
+from collections.abc import Iterable
+from enum import StrEnum
+from pylint.checkers import BaseRawFileChecker
+from pylint.lint import PyLinter
+from typing import Any
+
+
+class ImportType(StrEnum):
+    """
+    import type enumeration
+
+    Attributes:
+        Package(MethodTypeOrder): (class attribute) package import
+        PackageFrom(MethodTypeOrder): (class attribute) package import, from clause
+        System(ImportType): (class attribute) system installed packages
+        SystemFrom(MethodTypeOrder): (class attribute) system installed packages, from clause
+    """
+
+    Package = "package"
+    PackageFrom = "package-from"
+    System = "system"
+    SystemFrom = "system-from"
+
+
+class ImportOrder(BaseRawFileChecker):
+    """
+    check if imports are defined in recommended order
+    """
+
+    msgs = {
+        "W6002": (
+            "Invalid import order %s, expected before %s",
+            "imports-out-of-order",
+            "Imports are defined out of recommended order.",
+        ),
+        "W6003": (
+            "Import contains more than one package: %s",
+            "multiple-package-imports",
+            "Multiple package imports are not allowed.",
+        ),
+        "W6004": (
+            "Invalid from import order %s, expected %s",
+            "from-imports-out-of-order",
+            "From imports are defined out of recommended order.",
+        ),
+    }
+    name = "import-ordering"
+    options = (
+        (
+            "import-type-order",
+            {
+                "default": [
+                    "system",
+                    "system-from",
+                    "package",
+                    "package-from",
+                ],
+                "type": "csv",
+                "metavar": "<comma-separated types>",
+                "help": "Import types order to check.",
+            },
+        ),
+        (
+            "root-module",
+            {
+                "default": "ahriman",
+                "type": "string",
+                "help": "Root module name",
+            }
+        )
+    )
+
+    @staticmethod
+    def imports(source: Iterable[Any], start_lineno: int = 0) -> list[nodes.Import | nodes.ImportFrom]:
+        """
+        extract import nodes from list of raw nodes
+
+        Args:
+            source(Iterable[Any]): all available nodes
+            start_lineno(int, optional): minimal allowed line number (Default value = 0)
+
+        Returns:
+            list[nodes.Import | nodes.ImportFrom]: list of import nodes
+        """
+
+        def is_defined_import(imports: Any) -> bool:
+            return isinstance(imports, (nodes.Import, nodes.ImportFrom)) \
+                and imports.lineno is not None \
+                and imports.lineno >= start_lineno
+
+        return list(filter(is_defined_import, source))
+
+    def check_from_imports(self, imports: nodes.ImportFrom) -> None:
+        """
+        check import from statement
+
+        Args:
+            imports(nodes.ImportFrom): import from node
+        """
+        imported = [names for names, _ in imports.names]
+        for real, expected in zip(imported, sorted(imported)):
+            if real == expected:
+                continue
+            self.add_message("from-imports-out-of-order", line=imports.lineno, args=(real, expected))
+            break
+
+    def check_imports(self, imports: list[nodes.Import | nodes.ImportFrom], root_package: str) -> None:
+        """
+        check imports
+
+        Args:
+            imports(list[nodes.Import | nodes.ImportFrom]): list of imports in their defined order
+            root_package(str): root package name
+        """
+        last_statement: tuple[int, str] | None = None
+
+        for statement in imports:
+            # define types and perform specific checks
+            if isinstance(statement, nodes.ImportFrom):
+                import_name = statement.modname
+                root, *_ = import_name.split(".", maxsplit=1)
+                import_type = ImportType.PackageFrom if root_package == root else ImportType.SystemFrom
+                # check from import itself
+                self.check_from_imports(statement)
+            else:
+                import_name = next(name for name, _ in statement.names)
+                root, *_ = import_name.split(".", maxsplit=1)[0]
+                import_type = ImportType.Package if root_package == root else ImportType.System
+                # check import itself
+                self.check_package_imports(statement)
+
+            # extract index
+            try:
+                import_type_index = self.linter.config.import_type_order.index(import_type)
+            except ValueError:
+                import_type_index = len(self.linter.config.import_type_order)
+
+            # check ordering if possible
+            if last_statement is not None:
+                _, last_statement_name = last_statement
+                if last_statement > (import_type_index, import_name):
+                    self.add_message("imports-out-of-order", line=statement.lineno,
+                                     args=(import_name, last_statement_name))
+
+            # update the last value
+            last_statement = import_type_index, import_name
+
+    def check_package_imports(self, imports: nodes.Import) -> None:
+        """
+        check package import
+
+        Args:
+            imports(nodes.Import): package import node
+        """
+        if len(imports.names) != 1:
+            self.add_message("multiple-package-imports", line=imports.lineno, args=(imports.names,))
+
+    def process_module(self, node: nodes.Module) -> None:
+        """
+        process module
+
+        Args:
+            node(nodes.Module): module node to check
+        """
+        root_module, *_ = node.qname().split(".")
+        self.check_imports(self.imports(node.values()), root_module)
+
+
+def register(linter: PyLinter) -> None:
+    """
+    register custom checker
+
+    Args:
+        linter(PyLinter): linter in which checker should be registered
+    """
+    linter.register_checker(ImportOrder(linter))

pyproject.toml

@@ -8,7 +8,8 @@ name = "ahriman"
 description = "ArcH linux ReposItory MANager"
 readme = "README.md"
 
-requires-python = ">=3.11"
+# Actually we are using features from the latest python, however, ubuntu, which is used for CI doesn't have it
+requires-python = ">=3"
 
 license = {file = "COPYING"}
 authors = [
@@ -80,6 +81,7 @@ web = [
     "aiohttp_security",
     "cryptography",
     "requests-unixsocket",  # required by unix socket support
+    "setuptools",  # required by aiohttp-apispec
 ]
 
 [tool.flit.sdist]

recipes/README.md

@@ -9,7 +9,9 @@ Collection of the examples of docker compose configuration files, which covers s
 * [Distributed](distributed): cluster of three nodes, one with web interface and two workers which are responsible for build process.
 * [Distributed manual](distributed-manual): same as [distributed](distributed), but two nodes and update process must be run on worker node manually.
 * [i686](i686): non-x86_64 architecture setup.
+* [Index](index): repository with index page generator enabled.
 * [Multi repo](multirepo): run web service with two separated repositories.
+* [OAuth](oauth): web service with OAuth (GitHub provider) authentication enabled.
 * [Pull](pull): normal service, but in addition with pulling packages from another source (e.g. GitHub repository).
 * [Sign](sign): create repository with database signing.
 * [Web](web): simple web service with authentication enabled.

recipes/index/README.md

@@ -0,0 +1,6 @@
+# Index
+
+1. Setup repository named `ahriman-demo` with architecture `x86_64`.
+2. Generate index page. 
+3. Repository is available at `http://localhost:8080/repo`.
+4. Index page is available at `http://localhost:8080/repo/ahriman-demo/x86_64/index.html`

recipes/index/compose.yml

@@ -0,0 +1,48 @@
+services:
+  backend:
+    image: arcan1s/ahriman:edge
+    privileged: true
+
+    environment:
+      AHRIMAN_DEBUG: yes
+      AHRIMAN_OUTPUT: console
+      AHRIMAN_REPOSITORY: ahriman-demo
+
+    configs:
+      - source: service
+        target: /etc/ahriman.ini.d/99-settings.ini
+
+    volumes:
+      - type: volume
+        source: repository
+        target: /var/lib/ahriman
+        volume:
+          nocopy: true
+
+    command: repo-report
+
+  frontend:
+    image: nginx
+    ports:
+      - 8080:80
+
+    configs:
+      - source: nginx
+        target: /etc/nginx/conf.d/default.conf
+
+    volumes:
+      - type: volume
+        source: repository
+        target: /srv
+        read_only: true
+        volume:
+          nocopy: true
+
+configs:
+  nginx:
+    file: nginx.conf
+  service:
+    file: service.ini
+
+volumes:
+  repository:

recipes/index/nginx.conf

@@ -0,0 +1,9 @@
+server {
+    listen 80;
+
+    location /repo {
+        rewrite ^/repo/(.*) /$1 break;
+        autoindex on;
+        root /srv/ahriman/repository;
+    }
+}

recipes/index/service.ini

@@ -0,0 +1,6 @@
+[report]
+target = html
+
+[html]
+path = /var/lib/ahriman/ahriman/repository/ahriman-demo/x86_64/index.html
+link_path = http://localhost:8080/repo/ahriman-demo/x86_64

recipes/oauth/README.md

@@ -0,0 +1,15 @@
+# OAuth
+
+1. Create user from `AHRIMAN_OAUTH_USER` environment variable (same as GitHub user).
+2. Configure OAuth to use GitHub provider with client ID and secret specified in variables `AHRIMAN_OAUTH_CLIENT_ID` and `AHRIMAN_OAUTH_CLIENT_SECRET` variables respectively.   
+3. Setup repository named `ahriman-demo` with architecture `x86_64`.
+4. Start web server at port `8080`.
+5. Repository is available at `http://localhost:8080/repo`.
+
+Before you start, you need to create an application. It can be done by:
+
+1. Go to `https://github.com/settings/applications/new`
+2. Set application name and its homepage.
+3. Set callback url to `http://localhost:8080/api/v1/login`
+4. Copy Client ID.
+5. Generate new client secret and copy it.

recipes/oauth/compose.yml

@@ -0,0 +1,58 @@
+services:
+  backend:
+    image: arcan1s/ahriman:edge
+    privileged: true
+
+    environment:
+      AHRIMAN_DEBUG: yes
+      AHRIMAN_OAUTH_CLIENT_ID: ${AHRIMAN_OAUTH_CLIENT_ID}
+      AHRIMAN_OAUTH_CLIENT_SECRET: ${AHRIMAN_OAUTH_CLIENT_SECRET}
+      AHRIMAN_OUTPUT: console
+      AHRIMAN_PORT: 8080
+      AHRIMAN_PRESETUP_COMMAND: sudo -u ahriman ahriman user-add ${AHRIMAN_OAUTH_USER} -R full -p ""
+      AHRIMAN_REPOSITORY: ahriman-demo
+      AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman.sock
+
+    configs:
+      - source: service
+        target: /etc/ahriman.ini.d/99-settings.ini
+
+    volumes:
+      - type: volume
+        source: repository
+        target: /var/lib/ahriman
+        volume:
+          nocopy: true
+
+    healthcheck:
+      test: curl --fail --silent --output /dev/null http://backend:8080/api/v1/info
+      interval: 10s
+      start_period: 30s
+
+    command: web
+
+  frontend:
+    image: nginx
+    ports:
+      - 8080:80
+
+    configs:
+      - source: nginx
+        target: /etc/nginx/conf.d/default.conf
+
+    volumes:
+      - type: volume
+        source: repository
+        target: /srv
+        read_only: true
+        volume:
+          nocopy: true
+
+configs:
+  nginx:
+    file: nginx.conf
+  service:
+    file: service.ini
+
+volumes:
+  repository:

recipes/oauth/nginx.conf

@@ -0,0 +1,18 @@
+server {
+    listen 80;
+
+    location /repo {
+        rewrite ^/repo/(.*) /$1 break;
+        autoindex on;
+        root /srv/ahriman/repository;
+    }
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarder-Proto $scheme;
+
+        proxy_pass http://backend:8080;
+    }
+}

recipes/oauth/service.ini

@@ -0,0 +1,11 @@
+[auth]
+target = oauth
+client_id = $AHRIMAN_OAUTH_CLIENT_ID
+client_secret = $AHRIMAN_OAUTH_CLIENT_SECRET
+
+oauth_icon = github
+oauth_provider = GithubClient
+oauth_scopes = read:user
+
+[web]
+address = http://localhost:8080

src/ahriman/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.12.2"
+__version__ = "2.13.6"

src/ahriman/application/ahriman.py

@@ -71,7 +71,7 @@ def _parser() -> argparse.ArgumentParser:
                                      fromfile_prefix_chars="@", formatter_class=_formatter)
     parser.add_argument("-a", "--architecture", help="filter by target architecture")
     parser.add_argument("-c", "--configuration", help="configuration path", type=Path,
-                        default=Path("/etc") / "ahriman.ini")
+                        default=Path("/") / "etc" / "ahriman.ini")
     parser.add_argument("--force", help="force run, remove file lock", action="store_true")
     parser.add_argument("-l", "--lock", help="lock file", type=Path,
                         default=Path(tempfile.gettempdir()) / "ahriman.lock")
@@ -999,7 +999,7 @@ def _set_service_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              formatter_class=_formatter)
     parser.add_argument("--build-as-user", help="force makepkg user to the specific one")
     parser.add_argument("--from-configuration", help="path to default devtools pacman configuration",
-                        type=Path, default=Path("/usr") / "share" / "devtools" / "pacman.conf.d" / "extra.conf")
+                        type=Path, default=Path("/") / "usr" / "share" / "devtools" / "pacman.conf.d" / "extra.conf")
     parser.add_argument("--generate-salt", help="generate salt for user passwords",
                         action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument("--makeflags-jobs", help="append MAKEFLAGS variable with parallelism set to number of cores",

src/ahriman/application/application/application_repository.py

@@ -163,8 +163,8 @@ class ApplicationRepository(ApplicationProperties):
         built_packages = self.repository.packages_built()
         if built_packages:  # speedup a bit
             build_result = self.repository.process_update(built_packages, packagers)
+            self.on_result(build_result)
             result.merge(build_result)
-            self.on_result(result.merge(build_result))
 
         builder = Updater.load(self.repository_id, self.configuration, self.repository)
 
@@ -173,7 +173,8 @@ class ApplicationRepository(ApplicationProperties):
         for num, partition in enumerate(partitions):
             self.logger.info("processing chunk #%i %s", num, [package.base for package in partition])
             build_result = builder.update(partition, packagers, bump_pkgrel=bump_pkgrel)
-            self.on_result(result.merge(build_result))
+            self.on_result(build_result)
+            result.merge(build_result)
 
         return result
 

src/ahriman/application/handlers/__init__.py

@@ -17,14 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.application.handlers.handler import Handler
-
 from ahriman.application.handlers.add import Add
 from ahriman.application.handlers.backup import Backup
 from ahriman.application.handlers.change import Change
 from ahriman.application.handlers.clean import Clean
 from ahriman.application.handlers.daemon import Daemon
 from ahriman.application.handlers.dump import Dump
+from ahriman.application.handlers.handler import Handler
 from ahriman.application.handlers.help import Help
 from ahriman.application.handlers.key_import import KeyImport
 from ahriman.application.handlers.patch import Patch

src/ahriman/application/handlers/add.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.packagers import Packagers
 from ahriman.models.pkgbuild_patch import PkgbuildPatch

src/ahriman/application/handlers/backup.py

@@ -23,7 +23,7 @@ import pwd
 from pathlib import Path
 from tarfile import TarFile
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/change.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import ChangesPrinter
 from ahriman.models.action import Action

src/ahriman/application/handlers/clean.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/daemon.py

@@ -21,7 +21,7 @@ import argparse
 
 from ahriman.application.application import Application
 from ahriman.application.application.updates_iterator import FixedUpdatesIterator, UpdatesIterator
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.application.handlers.update import Update
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/dump.py

@@ -19,7 +19,7 @@
 #
 import argparse
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import ConfigurationPathsPrinter, ConfigurationPrinter, StringPrinter
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/help.py

@@ -19,7 +19,7 @@
 #
 import argparse
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/key_import.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/patch.py

@@ -23,7 +23,7 @@ import sys
 from pathlib import Path
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import PatchPrinter

src/ahriman/application/handlers/rebuild.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.package import Package

src/ahriman/application/handlers/remove.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/remove_unknown.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/repositories.py

@@ -19,7 +19,7 @@
 #
 import argparse
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import RepositoryPrinter
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/restore.py

@@ -21,7 +21,7 @@ import argparse
 
 from tarfile import TarFile
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/run.py

@@ -20,7 +20,7 @@
 import argparse
 import shlex
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/search.py

@@ -19,10 +19,10 @@
 #
 import argparse
 
-from dataclasses import fields
 from collections.abc import Callable, Iterable
+from dataclasses import fields
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.alpm.remote import AUR, Official
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import OptionError

src/ahriman/application/handlers/service_updates.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman import __version__
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import UpdatePrinter
 from ahriman.models.package import Package

src/ahriman/application/handlers/setup.py

@@ -24,7 +24,7 @@ from pwd import getpwuid
 from urllib.parse import quote_plus as urlencode
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import MissingArchitectureError
 from ahriman.models.repository_id import RepositoryId
@@ -44,9 +44,9 @@ class Setup(Handler):
 
     ALLOW_MULTI_ARCHITECTURE_RUN = False  # conflicting io
 
-    ARCHBUILD_COMMAND_PATH = Path("/usr") / "bin" / "archbuild"
-    MIRRORLIST_PATH = Path("/etc") / "pacman.d" / "mirrorlist"
-    SUDOERS_DIR_PATH = Path("/etc") / "sudoers.d"
+    ARCHBUILD_COMMAND_PATH = Path("/") / "usr" / "bin" / "archbuild"
+    MIRRORLIST_PATH = Path("/") / "etc" / "pacman.d" / "mirrorlist"
+    SUDOERS_DIR_PATH = Path("/") / "etc" / "sudoers.d"
 
     @classmethod
     def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,

src/ahriman/application/handlers/shell.py

@@ -23,7 +23,7 @@ import sys
 
 from pathlib import Path
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/sign.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/handlers/status.py

@@ -22,7 +22,7 @@ import argparse
 from collections.abc import Callable
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import PackagePrinter, StatusPrinter
 from ahriman.models.build_status import BuildStatus

src/ahriman/application/handlers/status_update.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.action import Action
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/structure.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter, TreePrinter
 from ahriman.core.tree import Tree

src/ahriman/application/handlers/tree_migrate.py

@@ -19,7 +19,7 @@
 #
 import argparse
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.repository_paths import RepositoryPaths

src/ahriman/application/handlers/triggers.py

@@ -20,7 +20,7 @@
 import argparse
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.result import Result

src/ahriman/application/handlers/unsafe_commands.py

@@ -19,7 +19,7 @@
 #
 import argparse
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/update.py

@@ -22,7 +22,7 @@ import argparse
 from collections.abc import Callable
 
 from ahriman.application.application import Application
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.packagers import Packagers
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/users.py

@@ -20,7 +20,7 @@
 import argparse
 import getpass
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.exceptions import PasswordError

src/ahriman/application/handlers/validate.py

@@ -22,7 +22,7 @@ import copy
 
 from typing import Any
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.configuration.schema import CONFIGURATION_SCHEMA, ConfigurationSchema
 from ahriman.core.configuration.validator import Validator

src/ahriman/application/handlers/versions.py

@@ -25,7 +25,7 @@ from collections.abc import Generator
 from importlib import metadata
 
 from ahriman import __version__
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import VersionPrinter
 from ahriman.models.repository_id import RepositoryId

src/ahriman/application/handlers/web.py

@@ -21,7 +21,7 @@ import argparse
 
 from collections.abc import Generator
 
-from ahriman.application.handlers import Handler
+from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.spawn import Spawn
 from ahriman.core.triggers import TriggerLoader

src/ahriman/core/alpm/remote/__init__.py

@@ -17,8 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.alpm.remote.remote import Remote
-
 from ahriman.core.alpm.remote.aur import AUR
 from ahriman.core.alpm.remote.official import Official
 from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb
+from ahriman.core.alpm.remote.remote import Remote

src/ahriman/core/alpm/remote/aur.py

@@ -20,7 +20,7 @@
 from typing import Any
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import Remote
+from ahriman.core.alpm.remote.remote import Remote
 from ahriman.core.exceptions import PackageInfoError, UnknownPackageError
 from ahriman.models.aur_package import AURPackage
 

src/ahriman/core/alpm/remote/official.py

@@ -20,7 +20,7 @@
 from typing import Any
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import Remote
+from ahriman.core.alpm.remote.remote import Remote
 from ahriman.core.exceptions import PackageInfoError, UnknownPackageError
 from ahriman.models.aur_package import AURPackage
 

src/ahriman/core/alpm/remote/official_syncdb.py

@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import Official
+from ahriman.core.alpm.remote.official import Official
 from ahriman.core.exceptions import UnknownPackageError
 from ahriman.models.aur_package import AURPackage
 

src/ahriman/core/alpm/repo.py

@@ -68,7 +68,7 @@ class Repo(LazyLogging):
             path(Path): path to archive to add
         """
         check_output(
-            "repo-add", *self.sign_args, "-R", str(self.repo_path), str(path),
+            "repo-add", *self.sign_args, "--remove", str(self.repo_path), str(path),
             exception=BuildError.from_process(path.name),
             cwd=self.paths.repository,
             logger=self.logger,
@@ -78,8 +78,13 @@ class Repo(LazyLogging):
         """
         create empty repository database. It just calls add with empty arguments
         """
-        check_output("repo-add", *self.sign_args, str(self.repo_path),
-                     cwd=self.paths.repository, logger=self.logger, user=self.uid)
+        # since pacman-6.1.0 repo-add doesn't create empty database in case if no packages supplied
+        # this code creates empty files instead
+        if self.repo_path.exists():
+            return  # database is already created, skip this part
+
+        self.repo_path.touch(exist_ok=True)
+        (self.paths.repository / f"{self.name}.db").symlink_to(self.repo_path)
 
     def remove(self, package: str, filename: Path) -> None:
         """

src/ahriman/core/auth/oauth.py

@@ -69,7 +69,8 @@ class OAuth(Mapping):
         Returns:
             str: login control as html code to insert
         """
-        return f"""<a class="nav-link" href="/api/v1/login" title="login via OAuth2"><i class="bi bi-{self.icon}"></i> login</a>"""
+        return f"""<a class="nav-link" href="/api/v1/login" title="login via OAuth2"><i class="bi bi-{
+            self.icon}"></i> login</a>"""
 
     @staticmethod
     def get_provider(name: str) -> type[aioauth_client.OAuth2Client]:
@@ -130,7 +131,7 @@ class OAuth(Mapping):
             client.access_token = access_token
 
             user, _ = await client.user_info()
-            username: str = user.email  # type: ignore[attr-defined]
+            username: str = user.email or user.username  # type: ignore[attr-defined]
             return username
         except Exception:
             self.logger.exception("got exception while performing request")

src/ahriman/core/build_tools/task.py

@@ -38,6 +38,7 @@ class Task(LazyLogging):
         archbuild_flags(list[str]): command flags for archbuild command
         architecture(str): repository architecture
         build_command(str): build command
+        include_debug_packages(bool): whether to include debug packages or not
         makechrootpkg_flags(list[str]): command flags for makechrootpkg command
         makepkg_flags(list[str]): command flags for makepkg command
         package(Package): package definitions
@@ -63,6 +64,7 @@ class Task(LazyLogging):
 
         self.archbuild_flags = configuration.getlist("build", "archbuild_flags", fallback=[])
         self.build_command = configuration.get("build", "build_command")
+        self.include_debug_packages = configuration.getboolean("build", "include_debug_packages", fallback=True)
         self.makepkg_flags = configuration.getlist("build", "makepkg_flags", fallback=[])
         self.makechrootpkg_flags = configuration.getlist("build", "makechrootpkg_flags", fallback=[])
 
@@ -99,15 +101,20 @@ class Task(LazyLogging):
             environment=environment,
         )
 
-        # well it is not actually correct, but we can deal with it
+        package_list_command = ["makepkg", "--packagelist"]
+        if not self.include_debug_packages:
+            package_list_command.append("OPTIONS=(!debug)")  # disable debug flag manually
         packages = check_output(
-            "makepkg", "--packagelist",
+            *package_list_command,
             exception=BuildError.from_process(self.package.base),
             cwd=sources_dir,
             logger=self.logger,
             environment=environment,
         ).splitlines()
-        return [Path(package) for package in packages]
+        # some dirty magic here
+        # the filter is applied in order to make sure that result will only contain packages which were actually built
+        # e.g. in some cases packagelist command produces debug packages which were not actually built
+        return list(filter(lambda path: path.is_file(), map(Path, packages)))
 
     def init(self, sources_dir: Path, database: SQLite, local_version: str | None) -> str | None:
         """

src/ahriman/core/configuration/schema.py

@@ -176,6 +176,10 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
                     "empty": False,
                 },
             },
+            "include_debug_packages": {
+                "type": "boolean",
+                "coerce": "boolean",
+            },
             "makepkg_flags": {
                 "type": "list",
                 "coerce": "list",

src/ahriman/core/database/operations/__init__.py

@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.database.operations.operations import Operations
-
 from ahriman.core.database.operations.auth_operations import AuthOperations
 from ahriman.core.database.operations.build_operations import BuildOperations
 from ahriman.core.database.operations.changes_operations import ChangesOperations

src/ahriman/core/database/operations/auth_operations.py

@@ -19,7 +19,7 @@
 #
 from sqlite3 import Connection
 
-from ahriman.core.database.operations import Operations
+from ahriman.core.database.operations.operations import Operations
 from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess
 

src/ahriman/core/database/operations/build_operations.py

@@ -19,7 +19,7 @@
 #
 from sqlite3 import Connection
 
-from ahriman.core.database.operations import Operations
+from ahriman.core.database.operations.operations import Operations
 from ahriman.models.package import Package
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/core/database/operations/changes_operations.py

@@ -19,7 +19,7 @@
 #
 from sqlite3 import Connection
 
-from ahriman.core.database.operations import Operations
+from ahriman.core.database.operations.operations import Operations
 from ahriman.models.changes import Changes
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/core/database/operations/logs_operations.py

@@ -19,7 +19,7 @@
 #
 from sqlite3 import Connection
 
-from ahriman.core.database.operations import Operations
+from ahriman.core.database.operations.operations import Operations
 from ahriman.models.log_record_id import LogRecordId
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/core/database/operations/package_operations.py

@@ -20,7 +20,7 @@
 from collections.abc import Generator, Iterable
 from sqlite3 import Connection
 
-from ahriman.core.database.operations import Operations
+from ahriman.core.database.operations.operations import Operations
 from ahriman.models.build_status import BuildStatus
 from ahriman.models.package import Package
 from ahriman.models.package_description import PackageDescription

src/ahriman/core/database/operations/patch_operations.py

@@ -20,7 +20,7 @@
 from collections import defaultdict
 from sqlite3 import Connection
 
-from ahriman.core.database.operations import Operations
+from ahriman.core.database.operations.operations import Operations
 from ahriman.models.pkgbuild_patch import PkgbuildPatch
 
 

src/ahriman/core/distributed/distributed_system.py

@@ -51,7 +51,7 @@ class DistributedSystem(Trigger, WebClient):
                 "time_to_live": {
                     "type": "integer",
                     "coerce": "integer",
-                    "min": 0,
+                    "min": 1,
                 },
             },
         },

src/ahriman/core/distributed/worker_trigger.py

@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from collections import deque
 from threading import Lock, Timer
 
 from ahriman.core.configuration import Configuration
@@ -47,42 +46,42 @@ class WorkerTrigger(DistributedSystem):
         self.ping_interval = configuration.getint(section, "time_to_live", fallback=60) / 4.0
 
         self._lock = Lock()
-        self._timers: deque[Timer] = deque()  # because python doesn't have atomics
+        self._timer: Timer | None = None
 
     def create_timer(self) -> None:
         """
         create timer object and put it to queue
         """
-        timer = Timer(self.ping_interval, self.ping)
-        timer.start()
-        self._timers.append(timer)
+        self._timer = Timer(self.ping_interval, self.ping)
+        self._timer.start()
 
     def on_start(self) -> None:
         """
         trigger action which will be called at the start of the application
         """
-        self.logger.info("registering instance %s at %s", self.worker, self.address)
-        self.create_timer()
+        self.logger.info("registering instance %s in %s", self.worker, self.address)
+        with self._lock:
+            self.create_timer()
 
     def on_stop(self) -> None:
         """
         trigger action which will be called before the stop of the application
         """
-        self.logger.info("removing instance %s at %s", self.worker, self.address)
+        self.logger.info("removing instance %s in %s", self.worker, self.address)
         with self._lock:
-            for timer in self._timers:
-                timer.cancel()  # cancel running timers
-            self._timers.clear()  # clear queue
+            if self._timer is None:
+                return
+
+            self._timer.cancel()  # cancel remaining timers
+            self._timer = None  # reset state
 
     def ping(self) -> None:
         """
         register itself as alive worker and update the timer
         """
         with self._lock:
-            try:
-                self._timers.popleft()  # make sure that we have something to pull
+            if self._timer is None:  # no active timer set, exit loop
+                return
 
-                self.register()
-                self.create_timer()
-            except IndexError:
-                self.logger.warning("trigger is terminated, shutdown update cycle")
+            self.register()
+            self.create_timer()

src/ahriman/core/exceptions.py

@@ -330,5 +330,5 @@ class UnsafeRunError(RuntimeError):
             root_uid(int): ID of the owner of root directory
         """
         RuntimeError.__init__(self, f"Current UID {current_uid} differs from root owner {root_uid}. "
-                                    f"Note that for the most actions it is unsafe to run application as different user."
-                                    f" If you are 100% sure that it must be there try --unsafe option")
+                              f"Note that for the most actions it is unsafe to run application as different user."
+                              f" If you are 100% sure that it must be there try --unsafe option")

src/ahriman/core/formatters/__init__.py

@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.formatters.printer import Printer
-
 from ahriman.core.formatters.aur_printer import AurPrinter
 from ahriman.core.formatters.build_printer import BuildPrinter
 from ahriman.core.formatters.changes_printer import ChangesPrinter
@@ -26,6 +24,7 @@ from ahriman.core.formatters.configuration_paths_printer import ConfigurationPat
 from ahriman.core.formatters.configuration_printer import ConfigurationPrinter
 from ahriman.core.formatters.package_printer import PackagePrinter
 from ahriman.core.formatters.patch_printer import PatchPrinter
+from ahriman.core.formatters.printer import Printer
 from ahriman.core.formatters.repository_printer import RepositoryPrinter
 from ahriman.core.formatters.status_printer import StatusPrinter
 from ahriman.core.formatters.string_printer import StringPrinter

src/ahriman/core/formatters/changes_printer.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.formatters import Printer
+from ahriman.core.formatters.printer import Printer
 from ahriman.models.changes import Changes
 from ahriman.models.property import Property
 

src/ahriman/core/formatters/string_printer.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.formatters import Printer
+from ahriman.core.formatters.printer import Printer
 
 
 class StringPrinter(Printer):