raise 404 in case if repository is unknown

The old solution didn't actually work as expected, because devtools
configuration belongs to filesystem (as well as sudo one), so it was
still required to run setup command.

In order to handle additional repositories, the POSTSETUP and PRESETUP
commands variables have been introduced. FAQ has been updated as well

.github/workflows/docker-image.yml

@@ -1,42 +0,0 @@
-name: docker image
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-      - '!*rc*'
-
-jobs:
-  docker-image:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: extract docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            arcan1s/ahriman
-          tags: |
-            type=ref,event=tag
-            type=edge
-
-      - name: setup QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: setup docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: login to docker hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: build an image and push
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/docker.yml

@@ -0,0 +1,51 @@
+name: Docker image
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+      - '*'
+      - '!*rc*'
+
+jobs:
+  docker-image:
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+
+    steps:
+      - uses: docker/setup-qemu-action@v2
+
+      - uses: docker/setup-buildx-action@v2
+
+      - name: Login to docker hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to github container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            arcan1s/ahriman
+            ghcr.io/arcan1s/ahriman
+          tags: |
+            type=semver,pattern={{raw}}
+            type=edge
+
+      - name: Build an image and push
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: release
+name: Release
 
 on:
   push:
@@ -11,25 +11,25 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: extract version
+      - name: Extract version
         id: version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
 
-      - name: create changelog
+      - name: Create changelog
         id: changelog
         uses: jaywcjlove/changelog-generator@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           filter: 'Release \d+\.\d+\.\d+'
 
-      - name: create archive
+      - name: Create archive
         run: make archive
         env:
           VERSION: ${{ steps.version.outputs.VERSION }}
 
-      - name: release
+      - name: Publish release
         uses: softprops/action-gh-release@v1
         with:
           body: |

.github/workflows/setup.sh

@@ -10,9 +10,9 @@ echo -e '[arcanisrepo]\nServer = http://repo.arcanis.me/$arch\nSigLevel = Never'
 # refresh the image
 pacman --noconfirm -Syu
 # main dependencies
-pacman --noconfirm -Sy base-devel devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo sudo
+pacman --noconfirm -Sy base-devel devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo python-systemd sudo
 # make dependencies
-pacman --noconfirm -Sy python-build python-installer python-wheel
+pacman --noconfirm -Sy python-build python-flit python-installer python-wheel
 # optional dependencies
 if [[ -z $MINIMAL_INSTALL ]]; then
     # VCS support
@@ -22,6 +22,8 @@ if [[ -z $MINIMAL_INSTALL ]]; then
     # additional features
     pacman --noconfirm -Sy gnupg python-boto3 rsync
 fi
+# FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
+cp "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 
 # create fresh tarball
 make VERSION=1.0.0 archlinux  # well, it does not really matter which version we will put here
@@ -34,27 +36,23 @@ pacman --noconfirm -U ahriman-1.0.0-1-any.pkg.tar.zst
 # create machine-id which is required by build tools
 systemd-machine-id-setup
 
-# special thing for the container, because /dev/log interface is not available there
-sed -i "s/handlers = syslog_handler/handlers = console_handler/g" /etc/ahriman.ini.d/logging.ini
 # initial setup command as root
 [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
-ahriman -a x86_64 service-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" "${WEB_ARGS[@]}"
+ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
 # validate configuration
-ahriman -a x86_64 service-config-validate --exit-code
+ahriman service-config-validate --exit-code
 # enable services
-systemctl enable ahriman-web@x86_64
-systemctl enable ahriman@x86_64.timer
+systemctl enable ahriman-web
+systemctl enable ahriman@x86_64-github.timer
 if [[ -z $MINIMAL_INSTALL ]]; then
     # run web service (detached)
-    sudo -u ahriman -- ahriman -a x86_64 web &
+    sudo -u ahriman -- ahriman web &
     WEB_PID=$!
-    sleep 15s  # wait for the web service activation
 fi
 # add the first package
-# the build itself does not really work in the container
-sudo -u ahriman -- ahriman package-add --now yay
+sudo -u ahriman -- ahriman package-add --now ahriman
 # check if package was actually installed
-test -n "$(find "/var/lib/ahriman/repository/x86_64" -name "yay*pkg*")"
+test -n "$(find "/var/lib/ahriman/repository/github/x86_64" -name "ahriman*pkg*")"
 # run package check
 sudo -u ahriman -- ahriman repo-update
 # stop web service lol

.github/workflows/setup.yml

@@ -1,4 +1,4 @@
-name: setup
+name: Setup
 
 on:
   push:
@@ -12,15 +12,15 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: archlinux:latest
+      image: archlinux:base
       volumes:
         - ${{ github.workspace }}:/build
       options: --privileged -w /build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: setup the minimal service in arch linux container
+      - name: Setup the minimal service in arch linux container
         run: .github/workflows/setup.sh minimal
 
   run-setup:
@@ -28,13 +28,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: archlinux:latest
+      image: archlinux:base
       volumes:
         - ${{ github.workspace }}:/build
       options: --privileged -w /build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: setup the service in arch linux container
+      - name: Setup the service in arch linux container
         run: .github/workflows/setup.sh

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: tests
+name: Tests
 
 on:
   push:
@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: archlinux:latest
+      image: archlinux:base
       volumes:
         - ${{ github.workspace }}:/build
       options: -w /build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: run check and tests in arch linux container
+      - name: Run check and tests in arch linux container
         run: .github/workflows/tests.sh

.pylintrc

@@ -1,28 +1,78 @@
-[MASTER]
+[MAIN]
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Clear in-memory caches upon conclusion of linting. Useful if running pylint
+# in a server-like mode.
+clear-cache-post-run=no
+
+# Load and enable all available extensions. Use --list-extensions to see a list
+# all available extensions.
+#enable-all-extensions=
+
+# In error mode, messages with a category besides ERROR or FATAL are
+# suppressed, and no reports are done by default. Error mode is compatible with
+# disabling specific errors.
+#errors-only=
+
+# Always return a 0 (non-error) status code, even if lint errors are found.
+# This is primarily useful in continuous integration scripts.
+#exit-zero=
 
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
 # run arbitrary code.
+extension-pkg-allow-list=
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code. (This is an alternative name to extension-pkg-allow-list
+# for backward compatibility.)
 extension-pkg-whitelist=
 
-# Specify a score threshold to be exceeded before program exits with error.
-fail-under=10.0
+# Return non-zero exit code if any of these messages/categories are detected,
+# even if score is above --fail-under value. Syntax same as enable. Messages
+# specified are enabled, while categories only check already-enabled messages.
+fail-on=
 
-# Add files or directories to the blacklist. They should be base names, not
-# paths.
+# Specify a score threshold under which the program will exit with error.
+fail-under=10
+
+# Interpret the stdin as a python script, whose filename needs to be passed as
+# the module_or_package argument.
+#from-stdin=
+
+# Files or directories to be skipped. They should be base names, not paths.
 ignore=CVS
 
-# Add files or directories matching the regex patterns to the blacklist. The
-# regex matches against base names, not paths.
-ignore-patterns=
+# Add files or directories matching the regular expressions patterns to the
+# ignore-list. The regex matches against paths and can be in Posix or Windows
+# format. Because '\\' represents the directory delimiter on Windows systems,
+# it can't be used as an escape character.
+ignore-paths=
+
+# Files or directories matching the regular expression patterns are skipped.
+# The regex matches against base names, not paths. The default value ignores
+# Emacs file locks
+ignore-patterns=^\.#
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
 #init-hook=
 
 # Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
-# number of processors available to use.
-jobs=0
+# number of processors available to use, and will cap the count on Windows to
+# avoid hangs.
+jobs=1
 
 # Control the amount of potential inferred values when inferring a single
 # object. This can help the performance when dealing with large functions or
@@ -36,6 +86,19 @@ load-plugins=
 # Pickle collected data for later comparisons.
 persistent=yes
 
+# Minimum Python version to use for version dependent checks. Will default to
+# the version used to run pylint.
+py-version=3.11
+
+# Discover python modules and packages in the file system subtree.
+recursive=no
+
+# Add paths to the list of the source roots. Supports globbing patterns. The
+# source root is an absolute path or a path relative to the current working
+# directory used to determine a package namespace for modules located under the
+# source root.
+source-roots=
+
 # When enabled, pylint would attempt to guess common misconfiguration and emit
 # user-friendly hints instead of false-positive error messages.
 suggestion-mode=yes
@@ -44,120 +107,8 @@ suggestion-mode=yes
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no
 
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
-confidence=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once). You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use "--disable=all --enable=classes
-# --disable=W".
-disable=raw-checker-failed,
-        bad-inline-option,
-        locally-disabled,
-        file-ignored,
-        suppressed-message,
-        useless-suppression,
-        deprecated-pragma,
-        use-symbolic-message-instead,
-        missing-module-docstring,
-        line-too-long,
-        no-name-in-module,
-        import-outside-toplevel,
-        invalid-name,
-        raise-missing-from,
-        wrong-import-order,
-        too-few-public-methods,
-        too-many-instance-attributes,
-        broad-except,
-        too-many-ancestors,
-        fixme,
-        too-many-arguments,
-        duplicate-code,
-        cyclic-import,
-        confusing-with-statement,
-
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-enable=c-extension-no-member
-
-
-[REPORTS]
-
-# Python expression which should return a score less than or equal to 10. You
-# have access to the variables 'error', 'warning', 'refactor', and 'convention'
-# which contain the number of messages in each category, as well as 'statement'
-# which is the total number of statements analyzed. This score is used by the
-# global evaluation report (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details.
-#msg-template=
-
-# Set the output format. Available formats are text, parseable, colorized, json
-# and msvs (visual studio). You can also give a reporter class, e.g.
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Tells whether to display a full report or only the messages.
-reports=no
-
-# Activate the evaluation score.
-score=yes
-
-
-[REFACTORING]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-# Complete name of functions that never returns. When checking for
-# inconsistent-return-statements if a never returning function is called then
-# it will be considered as an explicit return statement and no message will be
-# printed.
-never-returning-functions=sys.exit
-
-
-[FORMAT]
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-
-# Number of spaces of indent required inside a hanging or continued line.
-indent-after-paren=4
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-# Maximum number of characters on a single line.
-max-line-length=100
-
-# Maximum number of lines in a module.
-max-module-lines=400
-
-# Allow the body of a class to be on the same line as the declaration if body
-# contains single statement.
-single-line-class-stmt=no
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
+# In verbose mode, extra non-checker-related info will be displayed.
+#verbose=
 
 
 [BASIC]
@@ -166,13 +117,15 @@ single-line-if-stmt=no
 argument-naming-style=snake_case
 
 # Regular expression matching correct argument names. Overrides argument-
-# naming-style.
+# naming-style. If left empty, argument names will be checked with the set
+# naming style.
 #argument-rgx=
 
 # Naming style matching correct attribute names.
 attr-naming-style=snake_case
 
 # Regular expression matching correct attribute names. Overrides attr-naming-
+# style. If left empty, attribute names will be checked with the set naming
 # style.
 #attr-rgx=
 
@@ -192,20 +145,30 @@ bad-names-rgxs=
 class-attribute-naming-style=any
 
 # Regular expression matching correct class attribute names. Overrides class-
-# attribute-naming-style.
+# attribute-naming-style. If left empty, class attribute names will be checked
+# with the set naming style.
 #class-attribute-rgx=
 
+# Naming style matching correct class constant names.
+class-const-naming-style=UPPER_CASE
+
+# Regular expression matching correct class constant names. Overrides class-
+# const-naming-style. If left empty, class constant names will be checked with
+# the set naming style.
+#class-const-rgx=
+
 # Naming style matching correct class names.
 class-naming-style=PascalCase
 
 # Regular expression matching correct class names. Overrides class-naming-
-# style.
+# style. If left empty, class names will be checked with the set naming style.
 #class-rgx=
 
 # Naming style matching correct constant names.
 const-naming-style=UPPER_CASE
 
 # Regular expression matching correct constant names. Overrides const-naming-
+# style. If left empty, constant names will be checked with the set naming
 # style.
 #const-rgx=
 
@@ -217,7 +180,8 @@ docstring-min-length=-1
 function-naming-style=snake_case
 
 # Regular expression matching correct function names. Overrides function-
-# naming-style.
+# naming-style. If left empty, function names will be checked with the set
+# naming style.
 #function-rgx=
 
 # Good variable names which should always be accepted, separated by a comma.
@@ -239,21 +203,22 @@ include-naming-hint=no
 inlinevar-naming-style=any
 
 # Regular expression matching correct inline iteration names. Overrides
-# inlinevar-naming-style.
+# inlinevar-naming-style. If left empty, inline iteration names will be checked
+# with the set naming style.
 #inlinevar-rgx=
 
 # Naming style matching correct method names.
 method-naming-style=snake_case
 
 # Regular expression matching correct method names. Overrides method-naming-
-# style.
+# style. If left empty, method names will be checked with the set naming style.
 #method-rgx=
 
 # Naming style matching correct module names.
 module-naming-style=snake_case
 
 # Regular expression matching correct module names. Overrides module-naming-
-# style.
+# style. If left empty, module names will be checked with the set naming style.
 #module-rgx=
 
 # Colon-delimited sets of names that determine each other's naming style when
@@ -269,209 +234,56 @@ no-docstring-rgx=^_
 # These decorators are taken in consideration only for invalid-name.
 property-classes=abc.abstractproperty
 
+# Regular expression matching correct type alias names. If left empty, type
+# alias names will be checked with the set naming style.
+#typealias-rgx=
+
+# Regular expression matching correct type variable names. If left empty, type
+# variable names will be checked with the set naming style.
+#typevar-rgx=
+
 # Naming style matching correct variable names.
 variable-naming-style=snake_case
 
 # Regular expression matching correct variable names. Overrides variable-
-# naming-style.
+# naming-style. If left empty, variable names will be checked with the set
+# naming style.
 #variable-rgx=
 
 
-[TYPECHECK]
+[CLASSES]
 
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
+# Warn about protected attribute access inside special methods
+check-protected-access-in-special-methods=no
 
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp,
+                      asyncSetUp,
+                      __post_init__
 
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit
 
-# Tells whether to warn about missing members when the owner of the attribute
-# is inferred to be None.
-ignore-none=yes
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
 
-# This flag controls whether pylint should warn about no-member and similar
-# checks whenever an opaque object is returned when inferring. The inference
-# can return multiple potential results while evaluating a Python object, but
-# some branches might not be evaluated, which results in partial inference. In
-# that case, it might be useful to still emit no-member and other checks for
-# the rest of the inferred objects.
-ignore-on-opaque-inference=yes
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis). It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
-
-# Show a hint with possible names when a member name was not found. The aspect
-# of finding the hint is based on edit distance.
-missing-member-hint=yes
-
-# The minimum edit distance a name should have in order to be considered a
-# similar match for a missing member name.
-missing-member-hint-distance=1
-
-# The total number of similar names that should be taken in consideration when
-# showing a hint for a missing member.
-missing-member-max-choices=1
-
-# List of decorators that change the signature of a decorated function.
-signature-mutators=
-
-
-[SIMILARITIES]
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=no
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-
-[LOGGING]
-
-# The type of string formatting that logging methods do. `old` means using %
-# formatting, `new` is for `{}` formatting.
-logging-format-style=old
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format.
-logging-modules=logging
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,
-      XXX,
-      TODO
-
-# Regular expression of note tags to take in consideration.
-#notes-rgx=
-
-
-[SPELLING]
-
-# Limits count of emitted suggestions for spelling mistakes.
-max-spelling-suggestions=4
-
-# Spelling dictionary name. Available dictionaries: none. To make it work,
-# install the python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains the private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to the private dictionary (see the
-# --spelling-private-dict-file option) instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[VARIABLES]
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid defining new builtins when possible.
-additional-builtins=
-
-# Tells whether unused global variables should be treated as a violation.
-allow-global-unused-variables=yes
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,
-          _cb
-
-# A regular expression matching the name of dummy variables (i.e. expected to
-# not be used).
-dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore.
-ignored-argument-names=_.*|^ignored_|^unused_
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
-
-
-[STRING]
-
-# This flag controls whether inconsistent-quotes generates a warning when the
-# character used as a quote delimiter is used inconsistently within a module.
-check-quote-consistency=no
-
-# This flag controls whether the implicit-str-concat should generate a warning
-# on implicit string concatenation in sequences defined over several lines.
-check-str-concat-over-line-jumps=no
-
-
-[IMPORTS]
-
-# List of modules that can be imported at any level, not just the top level
-# one.
-allow-any-import-level=
-
-# Allow wildcard imports from modules that define __all__.
-allow-wildcard-with-all=no
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-# Deprecated modules which should not be used, separated by a comma.
-deprecated-modules=optparse,tkinter.tix
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled).
-ext-import-graph=
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled).
-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled).
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant
-
-# Couples of modules and preferred modules, separated by a comma.
-preferred-modules=
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
 
 
 [DESIGN]
 
+# List of regular expressions of class ancestor names to ignore when counting
+# public methods (see R0903)
+exclude-too-few-public-methods=
+
+# List of qualified class names to ignore when counting class parents (see
+# R0901)
+ignored-parents=
+
 # Maximum number of arguments for function / method.
 max-args=5
 
@@ -503,35 +315,331 @@ max-statements=50
 min-public-methods=2
 
 
-[CLASSES]
-
-# Warn about protected attribute access inside special methods
-check-protected-access-in-special-methods=no
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,
-                      __new__,
-                      setUp,
-                      __post_init__
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,
-                  _fields,
-                  _replace,
-                  _source,
-                  _make
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=cls
-
-
 [EXCEPTIONS]
 
-# Exceptions that will emit a warning when being caught. Defaults to
-# "BaseException, Exception".
-overgeneral-exceptions=builtins.BaseException,
-                       builtins.Exception
+# Exceptions that will emit a warning when caught.
+overgeneral-exceptions=builtins.BaseException,builtins.Exception
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[IMPORTS]
+
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow explicit reexports by alias from a package __init__.
+allow-reexport-from-package=no
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=
+
+# Output a graph (.gv or any supported image format) of external dependencies
+# to the given file (report RP0402 must not be disabled).
+ext-import-graph=
+
+# Output a graph (.gv or any supported image format) of all (i.e. internal and
+# external) dependencies to the given file (report RP0402 must not be
+# disabled).
+import-graph=
+
+# Output a graph (.gv or any supported image format) of internal dependencies
+# to the given file (report RP0402 must not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[LOGGING]
+
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE,
+# UNDEFINED.
+confidence=HIGH,
+           CONTROL_FLOW,
+           INFERENCE,
+           INFERENCE_FAILURE,
+           UNDEFINED
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then re-enable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=raw-checker-failed,
+        bad-inline-option,
+        locally-disabled,
+        file-ignored,
+        suppressed-message,
+        useless-suppression,
+        deprecated-pragma,
+        use-symbolic-message-instead,
+        missing-module-docstring,
+        line-too-long,
+        no-name-in-module,
+        import-outside-toplevel,
+        invalid-name,
+        raise-missing-from,
+        wrong-import-order,
+        too-few-public-methods,
+        too-many-instance-attributes,
+        broad-except,
+        fixme,
+        too-many-arguments,
+        duplicate-code,
+        cyclic-import,
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[METHOD_ARGS]
+
+# List of qualified names (i.e., library.method) which require a timeout
+# parameter e.g. 'requests.api.get,requests.api.post'
+timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+# Regular expression of note tags to take in consideration.
+notes-rgx=
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit,argparse.parse_error
+
+
+[REPORTS]
+
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'fatal', 'error', 'warning', 'refactor',
+# 'convention', and 'info' which contain the number of messages in each
+# category, as well as 'statement' which is the total number of statements
+# analyzed. This score is used by the global evaluation report (RP0004).
+evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10))
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+#output-format=
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[SIMILARITIES]
+
+# Comments are removed from the similarity computation
+ignore-comments=yes
+
+# Docstrings are removed from the similarity computation
+ignore-docstrings=yes
+
+# Imports are removed from the similarity computation
+ignore-imports=yes
+
+# Signatures are removed from the similarity computation
+ignore-signatures=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. No available dictionaries : You need to install
+# both the python package and the system dependency for enchant to work..
+spelling-dict=
+
+# List of comma separated words that should be considered directives if they
+# appear at the beginning of a comment and should not be checked.
+spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy:
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of symbolic message names to ignore for Mixin members.
+ignored-checks-for-mixins=no-member,
+                          not-async-context-manager,
+                          not-context-manager,
+                          attribute-defined-outside-init
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+# Regex pattern to define which classes are considered mixins.
+mixin-class-rgx=.*[Mm]ixin
+
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of names allowed to shadow builtins
+allowed-redefined-builtins=
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io

.readthedocs.yaml

@@ -6,7 +6,7 @@ formats:
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.10"
+    python: "3.11"
 
 sphinx:
   builder: html
@@ -21,4 +21,3 @@ python:
         - docs
         - s3
         - web
-  system_packages: true

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Again, the most checks can be performed by `make check` command, though some add
         do foo. With very very very long
         docstring
   
-        Note:
+        Notes:
             Very important note about this function
   
         Args:
@@ -46,7 +46,7 @@ Again, the most checks can be performed by `make check` command, though some add
             int: result
   
         Raises:
-            RuntimeException: a local function error occurs
+            RuntimeError: a local function error occurs
   
         Examples:
             Very informative example how to use this function, e.g.::
@@ -103,6 +103,9 @@ Again, the most checks can be performed by `make check` command, though some add
         @property
         def property(self) -> Any: ...
   
+        @cached_property
+        def property_cached(self) -> Any: ...  # cached property has to be treated as normal one
+
         @classmethod
         def class_method(cls) -> Self: ...
 
@@ -127,6 +130,12 @@ Again, the most checks can be performed by `make check` command, though some add
 * Configuration interactions must go through `ahriman.core.configuration.Configuration` class instance.
 * In case if class load requires some actions, it is recommended to create class method which can be used for class instantiating.
 * The code must follow the exception safety, unless it is explicitly asked by end user. It means that most exceptions must be handled and printed to log, no other actions must be done (e.g. raising another exception).
+* Exceptions without parameters should be raised without parentheses, e.g.:
+
+    ```python
+    raise RuntimeError
+    ```
+
 * For the external command `ahriman.core.util.check_output` function must be used.
 * Every temporary file/directory must be removed at the end of processing, no matter what. The `tempfile` module provides good ways to do it.
 * Import order must be the following:
@@ -155,7 +164,7 @@ Again, the most checks can be performed by `make check` command, though some add
 * One file should define only one class, exception is class satellites in case if file length remains less than 400 lines.
 * It is possible to create file which contains some functions (e.g. `ahriman.core.util`), but in this case you would need to define `__all__` attribute.
 * The file size mentioned above must be applicable in general. In case of big classes consider splitting them into traits. Note, however, that `pylint` includes comments and docstrings into counter, thus you need to check file size by other tools.
-* No global variable is allowed outside of `ahriman.version` module. `ahriman.core.context` is also special case.
+* No global variable is allowed outside of `ahriman` module. `ahriman.core.context` is also special case.
 * Single quotes are not allowed. The reason behind this restriction is the fact that docstrings must be written by using double quotes only, and we would like to make style consistent.
 * If your class writes anything to log, the `ahriman.core.log.LazyLogging` trait must be used.
 * Web API methods must be documented by using `aiohttp_apispec` library. Schema testing mostly should be implemented in related view class tests. Recommended example for documentation (excluding comments):
@@ -165,9 +174,7 @@ Again, the most checks can be performed by `make check` command, though some add
 
     from marshmallow import Schema, fields  
 
-    from ahriman.web.schemas.auth_schema import AuthSchema
-    from ahriman.web.schemas.error_schema import ErrorSchema
-    from ahriman.web.schemas.package_name_schema import PackageNameSchema
+    from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNameSchema, PaginationSchema
     from ahriman.web.views.base import BaseView
 
 
@@ -195,16 +202,21 @@ Again, the most checks can be performed by `make check` command, though some add
                 400: {"description": "Bad data is supplied", "schema": ErrorSchema},  # exception raised by this method
                 401: {"description": "Authorization required", "schema": ErrorSchema},  # should be always presented
                 403: {"description": "Access is forbidden", "schema": ErrorSchema},  # should be always presented
+                404: {"description": "Repository is unknown", "schema": ErrorSchema},  # include if BaseView.service() method is called
                 500: {"description": "Internal server error", "schema": ErrorSchema},  # should be always presented
             },
             security=[{"token": [POST_PERMISSION]}],
         )
         @aiohttp_apispec.cookies_schema(AuthSchema)  # should be always presented
         @aiohttp_apispec.match_info_schema(PackageNameSchema)
+        @aiohttp_apispec.querystring_schema(PaginationSchema)
         @aiohttp_apispec.json_schema(RequestSchema(many=True))
         async def post(self) -> None: ...
     ```
 
+* It is allowed to change web API to add new fields or remove optional ones. However, in case of model changes, new API version must be introduced.
+* On the other hand, it is allowed to change method signatures, however, it is recommended to add new parameters as optional if possible. Deprecated API can be dropped during major release.
+
 ### Other checks
 
 The projects also uses typing checks (provided by `mypy`) and some linter checks provided by `pylint` and `bandit`. Those checks must be passed successfully for any open pull requests.

Dockerfile

@@ -6,11 +6,14 @@ ENV AHRIMAN_DEBUG=""
 ENV AHRIMAN_FORCE_ROOT=""
 ENV AHRIMAN_HOST="0.0.0.0"
 ENV AHRIMAN_MULTILIB="yes"
-ENV AHRIMAN_OUTPUT="syslog"
+ENV AHRIMAN_OUTPUT=""
 ENV AHRIMAN_PACKAGER="ahriman bot <ahriman@example.com>"
 ENV AHRIMAN_PACMAN_MIRROR=""
 ENV AHRIMAN_PORT=""
+ENV AHRIMAN_POSTSETUP_COMMAND=""
+ENV AHRIMAN_PRESETUP_COMMAND=""
 ENV AHRIMAN_REPOSITORY="aur-clone"
+ENV AHRIMAN_REPOSITORY_SERVER=""
 ENV AHRIMAN_REPOSITORY_ROOT="/var/lib/ahriman/ahriman"
 ENV AHRIMAN_UNIX_SOCKET=""
 ENV AHRIMAN_USER="ahriman"
@@ -28,26 +31,30 @@ RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \
 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 --noconfirm -Sy devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \
-    pacman --noconfirm -Sy python-build python-installer python-wheel && \
-    pacman --noconfirm -Sy breezy mercurial python-aiohttp python-aiohttp-cors python-boto3 python-cryptography python-jinja python-requests-unixsocket rsync subversion && \
+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 breezy mercurial python-aiohttp python-aiohttp-cors 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-jinja2  \
                                             python-aiohttp-debugtoolbar python-aiohttp-session python-aiohttp-security
 
-# cleanup unused
-RUN find "/var/cache/pacman/pkg" -type f -delete
+## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
+COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 
 # install ahriman
 ## copy tree
 COPY --chown=build . "/home/build/ahriman"
 ## create package archive and install it
 RUN cd "/home/build/ahriman" && \
-    make VERSION=$(python -c "from src.ahriman.version import __version__; print(__version__)") archlinux && \
+    make VERSION=$(python -c "from src.ahriman import __version__; print(__version__)") archlinux && \
     cp ./*-src.tar.xz "package/archlinux" && \
     cd "package/archlinux" && \
     runuser -u build -- makepkg --noconfirm --install --skipchecksums && \
     cd / && rm -r "/home/build/ahriman"
 
+# cleanup unused
+RUN find "/var/cache/pacman/pkg" -type f -delete
+RUN pacman -Qdtq | pacman -Rscn --noconfirm -
+
 VOLUME ["/var/lib/ahriman"]
 
 # minimal runtime ahriman setup

Makefile

@@ -3,7 +3,7 @@
 
 PROJECT := ahriman
 
-FILES := AUTHORS CONTRIBUTING.md COPYING Makefile README.md SECURITY.md docs package src setup.py tox.ini web.png
+FILES := AUTHORS CONTRIBUTING.md COPYING Makefile README.md SECURITY.md docs package pyproject.toml src tox.ini web.png
 TARGET_FILES := $(addprefix $(PROJECT)/, $(FILES))
 IGNORE_FILES := package/archlinux src/.mypy_cache
 
@@ -38,7 +38,7 @@ html: specification
 	tox -e docs-html
 
 push: specification archlinux
-	git add package/archlinux/PKGBUILD src/ahriman/version.py docs/ahriman-architecture.svg docs/ahriman.1 docs/completions/
+	git add package/archlinux/PKGBUILD src/ahriman/__init__.py docs/ahriman-architecture.svg package/share/man/man1/ahriman.1 package/share/bash-completion/completions/_ahriman package/share/zsh/site-functions/_ahriman
 	git commit -m "Release $(VERSION)"
 	git tag "$(VERSION)"
 	git push
@@ -56,4 +56,4 @@ version:
 ifndef VERSION
 	$(error VERSION is required, but not set)
 endif
-	sed -i 's/^__version__ = .*/__version__ = "$(VERSION)"/' src/ahriman/version.py
+	sed -i 's/^__version__ = .*/__version__ = "$(VERSION)"/' src/ahriman/__init__.py

README.md

@@ -1,8 +1,8 @@
 # ArcH linux ReposItory MANager
 
-[![tests status](https://github.com/arcan1s/ahriman/actions/workflows/run-tests.yml/badge.svg)](https://github.com/arcan1s/ahriman/actions/workflows/run-tests.yml)
-[![setup status](https://github.com/arcan1s/ahriman/actions/workflows/run-setup.yml/badge.svg)](https://github.com/arcan1s/ahriman/actions/workflows/run-setup.yml)
-[![Docker Image Version (latest semver)](https://img.shields.io/docker/v/arcan1s/ahriman?label=docker%20image)](https://hub.docker.com/r/arcan1s/ahriman)
+[![tests status](https://github.com/arcan1s/ahriman/actions/workflows/tests.yml/badge.svg)](https://github.com/arcan1s/ahriman/actions/workflows/tests.yml)
+[![setup status](https://github.com/arcan1s/ahriman/actions/workflows/setup.yml/badge.svg)](https://github.com/arcan1s/ahriman/actions/workflows/setup.yml)
+[![Docker Image Version (latest semver)](https://img.shields.io/docker/v/arcan1s/ahriman?label=Docker%20image)](https://hub.docker.com/r/arcan1s/ahriman)
 [![CodeFactor](https://www.codefactor.io/repository/github/arcan1s/ahriman/badge)](https://www.codefactor.io/repository/github/arcan1s/ahriman)
 [![Documentation Status](https://readthedocs.org/projects/ahriman/badge/?version=latest)](https://ahriman.readthedocs.io/?badge=latest)
 
@@ -16,7 +16,8 @@ Wrapper for managing custom repository inspired by [repo-scripts](https://github
 * VCS packages support.
 * Official repository support.
 * Ability to patch AUR packages and even create package from local PKGBUILDs.
-* Sign support with gpg (repository, package, per package settings).
+* Various rebuild options with ability to automatically bump package version.
+* Sign support with gpg (repository, package), multiple packagers support.
 * Triggers for repository updates, e.g. synchronization to remote services (rsync, s3 and github) and report generation (email, html, telegram).
 * Repository status interface with optional authorization and control options:
 
@@ -37,5 +38,5 @@ The application provides reasonable defaults which allow to use it out-of-box; h
 ## Live demos
 
 * [Build status page](https://ahriman-demo.arcanis.me). You can log in as `demo` user by using `demo` password. However, you will not be able to run tasks. [HTTP API documentation](https://ahriman-demo.arcanis.me/api-docs) is also available.
-* [Repository index](http://repo.arcanis.me/x86_64/index.html).
+* [Repository index](http://repo.arcanis.me/arcanisrepo/x86_64/).
 * [Telegram feed](https://t.me/arcanisrepo).

docker/entrypoint.sh

@@ -15,15 +15,11 @@ database = $AHRIMAN_REPOSITORY_ROOT/ahriman.db
 host = $AHRIMAN_HOST
 
 EOF
-sed -i "s|handlers = syslog_handler|handlers = ${AHRIMAN_OUTPUT}_handler|g" "/etc/ahriman.ini.d/logging.ini"
 
 AHRIMAN_DEFAULT_ARGS=("--architecture" "$AHRIMAN_ARCHITECTURE")
-if [[ "$AHRIMAN_OUTPUT" == "syslog" ]]; then
-    if [ ! -e "/dev/log" ]; then
-        # by default ahriman uses syslog which is not available inside container
-        # to make noise less we force quiet mode in case if /dev/log was not mounted
-        AHRIMAN_DEFAULT_ARGS+=("--quiet")
-    fi
+AHRIMAN_DEFAULT_ARGS+=("--repository" "$AHRIMAN_REPOSITORY")
+if [ -n "$AHRIMAN_OUTPUT" ]; then
+    AHRIMAN_DEFAULT_ARGS+=("--log-handler" "$AHRIMAN_OUTPUT")
 fi
 
 # create repository root inside the [[mounted]] directory and set correct ownership
@@ -38,20 +34,25 @@ chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_GNUPG_HOME"
 # run built-in setup command
 AHRIMAN_SETUP_ARGS=("--build-as-user" "$AHRIMAN_USER")
 AHRIMAN_SETUP_ARGS+=("--packager" "$AHRIMAN_PACKAGER")
-AHRIMAN_SETUP_ARGS+=("--repository" "$AHRIMAN_REPOSITORY")
 if [ -z "$AHRIMAN_MULTILIB" ]; then
     AHRIMAN_SETUP_ARGS+=("--no-multilib")
 fi
 if [ -n "$AHRIMAN_PACMAN_MIRROR" ]; then
     AHRIMAN_SETUP_ARGS+=("--mirror" "$AHRIMAN_PACMAN_MIRROR")
 fi
+if [ -n "$AHRIMAN_REPOSITORY_SERVER" ]; then
+    AHRIMAN_SETUP_ARGS+=("--server" "$AHRIMAN_REPOSITORY_SERVER")
+fi
 if [ -n "$AHRIMAN_PORT" ]; then
     AHRIMAN_SETUP_ARGS+=("--web-port" "$AHRIMAN_PORT")
 fi
 if [ -n "$AHRIMAN_UNIX_SOCKET" ]; then
     AHRIMAN_SETUP_ARGS+=("--web-unix-socket" "$AHRIMAN_UNIX_SOCKET")
 fi
+
+[ -n "$AHRIMAN_PRESETUP_COMMAND" ] && eval "$AHRIMAN_PRESETUP_COMMAND"
 ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
+[ -n "$AHRIMAN_POSTSETUP_COMMAND" ] && eval "$AHRIMAN_POSTSETUP_COMMAND"
 
 # validate configuration if set
 [ -n "$AHRIMAN_VALIDATE_CONFIGURATION" ] && ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-config-validate --exit-code
@@ -63,8 +64,8 @@ systemd-machine-id-setup &> /dev/null
 # otherwise we prepend executable by sudo command
 if [ -n "$AHRIMAN_FORCE_ROOT" ]; then
     AHRIMAN_EXECUTABLE=("ahriman")
-elif ahriman help-commands-unsafe --command="$*" &> /dev/null; then
-    AHRIMAN_EXECUTABLE=("sudo" "-u" "$AHRIMAN_USER" "--" "ahriman")
+elif ahriman help-commands-unsafe -- "$@" &> /dev/null; then
+    AHRIMAN_EXECUTABLE=("sudo" "-E" "-u" "$AHRIMAN_USER" "--" "ahriman")
 else
     AHRIMAN_EXECUTABLE=("ahriman")
 fi

docker/systemd-nspawn.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Since https://gitlab.archlinux.org/archlinux/devtools/-/commit/5f4fd52e3836ddddb25a0f9e15d0acfed06f693d
+# it is impossible to start devtools inside docker container, because it requires slice registering
+# which is impossible because there is no init in container
+
+is_slice() {
+    [[ $1 =~ ^--slice* ]]
+}
+
+allowed=()
+for arg in "$@"; do
+    is_slice "$arg" && allowed+=("--keep-unit") || allowed+=("$arg")
+done
+
+exec /usr/bin/systemd-nspawn "${allowed[@]}"

docs/advanced-usage.rst

@@ -9,8 +9,9 @@ Depending on the goal the package can be used in different ways. Nevertheless, i
 
    from ahriman.core.configuration import Configuration
    from ahriman.core.database import SQLite
+   from ahriman.models.repository_id import RepositoryId
 
-   architecture = "x86_64"
+   repository_id = RepositoryId("x86_64", "aur-clone")
    configuration = Configuration.from_path(Path("/etc/ahriman.ini"), architecture)
    database = SQLite.load(configuration)
 
@@ -26,8 +27,10 @@ Almost all actions are wrapped by ``ahriman.core.repository.Repository`` class
 .. code-block:: python
 
    from ahriman.core.repository import Repository
+   from ahriman.models.pacman_synchronization import PacmanSynchronization
 
-   repository = Repository(architecture, configuration, database, report=True, unsafe=False)
+   repository = Repository(repository_id, configuration, database,
+                           report=True, refresh_pacman_database=PacmanSynchronization.Disabled)
 
 And the ``repository`` instance can be used to perform repository maintenance
 

docs/ahriman.application.handlers.rst

@@ -100,6 +100,14 @@ ahriman.application.handlers.remove\_unknown module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.repositories module
+------------------------------------------------
+
+.. automodule:: ahriman.application.handlers.repositories
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.restore module
 -------------------------------------------
 
@@ -172,6 +180,14 @@ ahriman.application.handlers.structure module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.tree\_migrate module
+-------------------------------------------------
+
+.. automodule:: ahriman.application.handlers.tree_migrate
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.triggers module
 --------------------------------------------
 

docs/ahriman.core.configuration.rst

@@ -20,6 +20,14 @@ ahriman.core.configuration.schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.configuration.shell\_interpolator module
+-----------------------------------------------------
+
+.. automodule:: ahriman.core.configuration.shell_interpolator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.configuration.validator module
 -------------------------------------------
 

docs/ahriman.core.database.migrations.rst

@@ -60,6 +60,46 @@ ahriman.core.database.migrations.m006\_packages\_architecture\_required module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.database.migrations.m007\_check\_depends module
+------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m007_check_depends
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m008\_packagers module
+-------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m008_packagers
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m009\_local\_source module
+-----------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m009_local_source
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m010\_version\_based\_logs\_removal module
+---------------------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m010_version_based_logs_removal
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m011\_repository\_name module
+--------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m011_repository_name
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.core.formatters.rst

@@ -20,6 +20,14 @@ ahriman.core.formatters.build\_printer module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.formatters.configuration\_paths\_printer module
+------------------------------------------------------------
+
+.. automodule:: ahriman.core.formatters.configuration_paths_printer
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.formatters.configuration\_printer module
 -----------------------------------------------------
 
@@ -52,6 +60,14 @@ ahriman.core.formatters.printer module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.formatters.repository\_printer module
+--------------------------------------------------
+
+.. automodule:: ahriman.core.formatters.repository_printer
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.formatters.status\_printer module
 ----------------------------------------------
 

docs/ahriman.core.http.rst

@@ -0,0 +1,21 @@
+ahriman.core.http package
+=========================
+
+Submodules
+----------
+
+ahriman.core.http.sync\_http\_client module
+-------------------------------------------
+
+.. automodule:: ahriman.core.http.sync_http_client
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.http
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.log.rst

@@ -20,6 +20,14 @@ ahriman.core.log.http\_log\_handler module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.log.journal\_handler module
+----------------------------------------
+
+.. automodule:: ahriman.core.log.journal_handler
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.log.lazy\_logging module
 -------------------------------------
 
@@ -28,10 +36,10 @@ ahriman.core.log.lazy\_logging module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.core.log.log module
----------------------------
+ahriman.core.log.log\_loader module
+-----------------------------------
 
-.. automodule:: ahriman.core.log.log
+.. automodule:: ahriman.core.log.log_loader
    :members:
    :no-undoc-members:
    :show-inheritance:

docs/ahriman.core.report.rst

@@ -36,6 +36,14 @@ ahriman.core.report.jinja\_template module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.report.remote\_call module
+---------------------------------------
+
+.. automodule:: ahriman.core.report.remote_call
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.report.report module
 ---------------------------------
 

docs/ahriman.core.rst

@@ -14,11 +14,13 @@ Subpackages
    ahriman.core.database
    ahriman.core.formatters
    ahriman.core.gitremote
+   ahriman.core.http
    ahriman.core.log
    ahriman.core.report
    ahriman.core.repository
    ahriman.core.sign
    ahriman.core.status
+   ahriman.core.support
    ahriman.core.triggers
    ahriman.core.upload
 

docs/ahriman.core.support.pkgbuild.rst

@@ -0,0 +1,37 @@
+ahriman.core.support.pkgbuild package
+=====================================
+
+Submodules
+----------
+
+ahriman.core.support.pkgbuild.keyring\_generator module
+-------------------------------------------------------
+
+.. automodule:: ahriman.core.support.pkgbuild.keyring_generator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.support.pkgbuild.mirrorlist\_generator module
+----------------------------------------------------------
+
+.. automodule:: ahriman.core.support.pkgbuild.mirrorlist_generator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.support.pkgbuild.pkgbuild\_generator module
+--------------------------------------------------------
+
+.. automodule:: ahriman.core.support.pkgbuild.pkgbuild_generator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.support.pkgbuild
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.support.rst

@@ -0,0 +1,45 @@
+ahriman.core.support package
+============================
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   ahriman.core.support.pkgbuild
+
+Submodules
+----------
+
+ahriman.core.support.keyring\_trigger module
+--------------------------------------------
+
+.. automodule:: ahriman.core.support.keyring_trigger
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.support.mirrorlist\_trigger module
+-----------------------------------------------
+
+.. automodule:: ahriman.core.support.mirrorlist_trigger
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.support.package\_creator module
+--------------------------------------------
+
+.. automodule:: ahriman.core.support.package_creator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.support
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.upload.rst

@@ -20,6 +20,14 @@ ahriman.core.upload.http\_upload module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.upload.remote\_service module
+------------------------------------------
+
+.. automodule:: ahriman.core.upload.remote_service
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.upload.rsync module
 --------------------------------
 

docs/ahriman.models.rst

@@ -60,6 +60,14 @@ ahriman.models.internal\_status module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.log\_handler module
+----------------------------------
+
+.. automodule:: ahriman.models.log_handler
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.log\_record\_id module
 -------------------------------------
 
@@ -108,6 +116,22 @@ ahriman.models.package\_source module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.packagers module
+-------------------------------
+
+.. automodule:: ahriman.models.packagers
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.models.pacman\_synchronization module
+---------------------------------------------
+
+.. automodule:: ahriman.models.pacman_synchronization
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.pkgbuild\_patch module
 -------------------------------------
 
@@ -116,6 +140,14 @@ ahriman.models.pkgbuild\_patch module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.process\_status module
+-------------------------------------
+
+.. automodule:: ahriman.models.process_status
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.property module
 ------------------------------
 
@@ -140,6 +172,14 @@ ahriman.models.report\_settings module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.repository\_id module
+------------------------------------
+
+.. automodule:: ahriman.models.repository_id
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.repository\_paths module
 ---------------------------------------
 
@@ -196,6 +236,14 @@ ahriman.models.user\_access module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.waiter module
+----------------------------
+
+.. automodule:: ahriman.models.waiter
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.rst

@@ -12,17 +12,6 @@ Subpackages
    ahriman.models
    ahriman.web
 
-Submodules
-----------
-
-ahriman.version module
-----------------------
-
-.. automodule:: ahriman.version
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/ahriman.web.schemas.rst

@@ -36,6 +36,14 @@ ahriman.web.schemas.error\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.file\_schema module
+---------------------------------------
+
+.. automodule:: ahriman.web.schemas.file_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.schemas.internal\_status\_schema module
 ---------------------------------------------------
 
@@ -116,6 +124,14 @@ ahriman.web.schemas.package\_status\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.pagination\_schema module
+---------------------------------------------
+
+.. automodule:: ahriman.web.schemas.pagination_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.schemas.pgp\_key\_id\_schema module
 -----------------------------------------------
 
@@ -132,6 +148,22 @@ ahriman.web.schemas.pgp\_key\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.process\_id\_schema module
+----------------------------------------------
+
+.. automodule:: ahriman.web.schemas.process_id_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.process\_schema module
+------------------------------------------
+
+.. automodule:: ahriman.web.schemas.process_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.schemas.remote\_schema module
 -----------------------------------------
 
@@ -140,6 +172,14 @@ ahriman.web.schemas.remote\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.repository\_id\_schema module
+-------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.repository_id_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.schemas.search\_schema module
 -----------------------------------------
 
@@ -156,6 +196,14 @@ ahriman.web.schemas.status\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.update\_flags\_schema module
+------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.update_flags_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.web.views.rst

@@ -8,9 +8,8 @@ Subpackages
    :maxdepth: 4
 
    ahriman.web.views.api
-   ahriman.web.views.service
-   ahriman.web.views.status
-   ahriman.web.views.user
+   ahriman.web.views.v1
+   ahriman.web.views.v2
 
 Submodules
 ----------

docs/ahriman.web.views.service.rst

@@ -1,69 +0,0 @@
-ahriman.web.views.service package
-=================================
-
-Submodules
-----------
-
-ahriman.web.views.service.add module
-------------------------------------
-
-.. automodule:: ahriman.web.views.service.add
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.service.pgp module
-------------------------------------
-
-.. automodule:: ahriman.web.views.service.pgp
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.service.rebuild module
-----------------------------------------
-
-.. automodule:: ahriman.web.views.service.rebuild
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.service.remove module
----------------------------------------
-
-.. automodule:: ahriman.web.views.service.remove
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.service.request module
-----------------------------------------
-
-.. automodule:: ahriman.web.views.service.request
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.service.search module
----------------------------------------
-
-.. automodule:: ahriman.web.views.service.search
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.service.update module
----------------------------------------
-
-.. automodule:: ahriman.web.views.service.update
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.web.views.service
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.web.views.status.rst

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

docs/ahriman.web.views.user.rst

@@ -1,29 +0,0 @@
-ahriman.web.views.user package
-==============================
-
-Submodules
-----------
-
-ahriman.web.views.user.login module
------------------------------------
-
-.. automodule:: ahriman.web.views.user.login
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.views.user.logout module
-------------------------------------
-
-.. automodule:: ahriman.web.views.user.logout
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.web.views.user
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.web.views.v1.rst

@@ -0,0 +1,20 @@
+ahriman.web.views.v1 package
+============================
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   ahriman.web.views.v1.service
+   ahriman.web.views.v1.status
+   ahriman.web.views.v1.user
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v1
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

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

@@ -0,0 +1,85 @@
+ahriman.web.views.v1.service package
+====================================
+
+Submodules
+----------
+
+ahriman.web.views.v1.service.add module
+---------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.add
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.pgp module
+---------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.pgp
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.process module
+-------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.process
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.rebuild module
+-------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.rebuild
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.remove module
+------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.remove
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.request module
+-------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.request
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.search module
+------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.search
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.update module
+------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.update
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.service.upload module
+------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.service.upload
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v1.service
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

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

@@ -0,0 +1,53 @@
+ahriman.web.views.v1.status package
+===================================
+
+Submodules
+----------
+
+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.repositories module
+-----------------------------------------------
+
+.. automodule:: ahriman.web.views.v1.status.repositories
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.status.status module
+-----------------------------------------
+
+.. automodule:: ahriman.web.views.v1.status.status
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v1.status
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

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

@@ -0,0 +1,29 @@
+ahriman.web.views.v1.user package
+=================================
+
+Submodules
+----------
+
+ahriman.web.views.v1.user.login module
+--------------------------------------
+
+.. automodule:: ahriman.web.views.v1.user.login
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.v1.user.logout module
+---------------------------------------
+
+.. automodule:: ahriman.web.views.v1.user.logout
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v1.user
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.web.views.v2.rst

@@ -0,0 +1,18 @@
+ahriman.web.views.v2 package
+============================
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   ahriman.web.views.v2.status
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.v2
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

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

@@ -0,0 +1,21 @@
+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

@@ -19,7 +19,7 @@ Full dependency diagram:
 ``ahriman.application`` package
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This package contains application (aka executable) related classes and everything for that. It also contains package called ``ahriman.application.handlers`` in which all available subcommands are described as separated classes derived from base ``ahriman.application.handlers.Handler`` class.
+This package contains application (aka executable) related classes and everything for it. It also contains package called ``ahriman.application.handlers`` in which all available subcommands are described as separated classes derived from base ``ahriman.application.handlers.Handler`` class.
 
 ``ahriman.application.application.Application`` (god class) is used for any interaction from parsers with repository. It is divided into multiple traits by functions (package related and repository related) in the same package.
 
@@ -33,20 +33,22 @@ This package contains everything required for the most of application actions an
 * ``ahriman.core.alpm`` package controls pacman related functions. It provides wrappers for ``pyalpm`` library and safe calls for repository tools (``repo-add`` and ``repo-remove``). Also this package contains ``ahriman.core.alpm.remote`` package which provides wrapper for remote sources (e.g. AUR RPC and official repositories RPC).
 * ``ahriman.core.auth`` package provides classes for authorization methods used by web mostly. Base class is ``ahriman.core.auth.Auth`` which must be called by ``load`` method.
 * ``ahriman.core.build_tools`` is a package which provides wrapper for ``devtools`` commands.
+* ``ahriman.core.configuration`` contains extension for standard ``configparser`` library and some validation related classes.
 * ``ahriman.core.database`` is everything including data and schema migrations for database.
 * ``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 later used 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.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).
 * ``ahriman.core.status`` contains helpers and watcher class which are required for web application. Reporter must be initialized by using ``ahriman.core.status.client.Client.load`` method.
-* ``ahriman.core.triggers`` package contains base trigger classes. Classes from this package must be imported in order to implement user extensions. In fact, ``ahriman.core.report`` and ``ahriman.core.upload`` use this package.
+* ``ahriman.core.support`` provides plugins for support packages (mirrorlist and keyring) generation.
+* ``ahriman.core.triggers`` package contains base trigger classes. Classes from this package must be imported in order to implement user extensions. In fact, ``ahriman.core.report``, ``ahriman.core.upload`` and other built-in triggers use this package.
 * ``ahriman.core.upload`` package provides sync feature, should not be called directly.
 
 This package also provides some generic functions and classes which may be used by other packages:
 
-* ``ahriman.core.configuration.Configuration`` is an extension for standard ``configparser`` library.
 * ``ahriman.core.exceptions`` provides custom exceptions.
 * ``ahriman.core.spawn.Spawn`` is a tool which can spawn another ``ahriman`` process. This feature is used by web application.
 * ``ahriman.core.tree`` is a dependency tree implementation.
@@ -54,7 +56,7 @@ This package also provides some generic functions and classes which may be used
 ``ahriman.models`` package
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-It provides models for any other part of application. Unlike ``ahriman.core`` package classes from here provide only conversion methods (e.g. create class from another or convert to). Mostly case classes and enumerations.
+It provides models for any other part of application. Unlike ``ahriman.core`` package classes from here provide only conversion methods (e.g. create class from another or convert to). It is mostly presented by case classes and enumerations.
 
 ``ahriman.web`` package
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -62,24 +64,27 @@ It provides models for any other part of application. Unlike ``ahriman.core`` pa
 Web application. It is important that this package is isolated from any other to allow it to be optional feature (i.e. dependencies which are required by the package are optional).
 
 * ``ahriman.web.middlewares`` provides middlewares for request handlers.
+* ``ahriman.web.schemas`` provides schemas (actually copy paste from dataclasses) used by swagger documentation.
 * ``ahriman.web.views`` contains web views derived from aiohttp view class.
+* ``ahriman.web.apispec`` provides generators for swagger documentation.
+* ``ahriman.web.cors`` contains helpers for cross origin resource sharing middlewares.
 * ``ahriman.web.routes`` creates routes for web application.
 * ``ahriman.web.web`` provides main web application functions (e.g. start, initialization).
 
 Application run
 ---------------
 
-* Parse command line arguments, find command and related handler which is set by parser.
-* Call ``Handler.execute`` method.
-* Define list of architectures to run. In case if there is more than one architecture specified run several subprocesses or process in current process otherwise. Class attribute ``ALLOW_MULTI_ARCHITECTURE_RUN`` controls whether application can be run in multiple processes or not - this feature is required for some handlers (e.g. ``Web``) which should be able to spawn child process in daemon mode (it is impossible to do from daemonic processes).
-* In each child process call lock functions.
-* After success checks pass control to ``Handler.run`` method defined by specific handler class.
-* Return result (success or failure) of each subprocess and exit from application.
-* Some handlers may override their status and throw ``ExitCode`` exception. This exception is just silently suppressed and changes application exit code to ``1``.
+#. Parse command line arguments, find subcommand and related handler which is set by the parser.
+#. Call ``Handler.execute`` method.
+#. Define list of architectures to run. In case if there is more than one architecture specified run several subprocesses or continue in current process otherwise. Class attribute ``ALLOW_MULTI_ARCHITECTURE_RUN`` controls whether the application can be run in multiple processes or not - this feature is required for some handlers (e.g. ``Web``, which should be able to spawn child process in daemon mode; it is impossible to do from daemonic processes).
+#. In each child process call lock functions.
+#. After success checks pass control to ``Handler.run`` method defined by specific handler class.
+#. Return result (success or failure) of each subprocess and exit from application.
+#. Some handlers may override their status and throw ``ExitCode`` exception. This exception is just silently suppressed and changes application exit code to ``1``.
 
 In the most cases handlers spawn god class ``ahriman.application.application.Application`` class and call required methods.
 
-Application is designed to run from ``systemd`` services and provides parametrized by architecture timer and service file for that.
+The application is designed to run from ``systemd`` services and provides parametrized by repository identifier timer and service file for that.
 
 Subcommand design
 ^^^^^^^^^^^^^^^^^
@@ -95,7 +100,52 @@ All subcommands are divided into several groups depending on the role they are d
 * ``user`` subcommands (``user-add``) are intended for user management.
 * ``web`` subcommands are related to web service management.
 
-For historical reasons and in order to keep backward compatibility some subcommands have aliases to their shorter forms or even other groups, but the service doesn't guarantee that they will remain unchanged.
+For historical reasons and in order to keep backward compatibility some subcommands have aliases to their shorter forms or even other groups, but the application doesn't guarantee that they will remain unchanged.
+
+Filesystem tree
+---------------
+
+The application supports two types of trees, one is for the legacy configuration (when there were no repository name explicit configuration available) and another one is the new-style tree. This document describes only new-style tree in order to avoid deprecated structures.
+
+Having default root as ``/var/lib/ahriman`` (differs from container though), the directory structure is the following:
+
+.. code-block::
+
+   /var/lib/ahriman/
+   ├── ahriman.db
+   ├── cache
+   ├── chroot
+   │   └── aur-clone
+   ├── packages
+   │   └── aur-clone
+   │       └── x86_64
+   ├── pacman
+   │   └── aur-clone
+   │       └── x86_64
+   │           ├── local
+   │           │   └── ALPM_DB_VERSION
+   │           └── sync
+   │               ├── core.db
+   │               ├── extra.db
+   │               └── multilib.db
+   │
+   └── repository
+       └── aur-clone
+           └── x86_64
+               ├── aur-clone.db -> aur-clone.db.tar.gz
+               ├── aur-clone.db.tar.gz
+               ├── aur-clone.files -> aur-clone.files.tar.gz
+               └── aur-clone.files.tar.gz
+
+There are multiple subdirectories, some of them are commons for any repository, but some of them are not.
+
+* ``cache`` is a directory with locally stored PKGBUILD's and VCS packages. It is common for all repositories and architectures.
+* ``chroot/{repository}`` is a chroot directory for ``devtools``. It is specific for each repository, but shared for different architectures inside (the ``devtools`` handles architectures automatically).
+* ``packages/{repository}/{architecture}`` is a directory with prebuilt packages. When package is built, first it will be uploaded to this directory and later will be handled by update process. It is architecture and repository specific.
+* ``pacman/{repository}/{architecture}`` is the repository and architecture specific caches for pacman's databases.
+* ``repository/{repository}/{architecture}`` is a repository packages directory.
+
+Normally you should avoid direct interaction with the application tree. For tree migration process refer to the :doc:`migration notes <migration>`.
 
 Database
 --------
@@ -114,7 +164,7 @@ Schema and data migrations
 
 The schema migration are applied according to current ``pragma user_info`` values, located at ``ahriman.core.database.migrations`` package and named as ``m000_migration_name.py`` (the preceding ``m`` is required in order to import migration content for tests). Additional class ``ahriman.core.database.migrations.Migrations`` reads all migrations automatically and applies them in alphabetical order.
 
-These migrations also contain data migrations. Though the recommended way is to migrate data directly from SQL requests, sometimes it is required to have external data (like packages list) in order to set correct data. To do so, special method `migrate_data` is used.
+These migrations can also contain data migrations. Though the recommended way is to migrate data directly from SQL requests, sometimes it is required to have external data (like packages list) in order to set correct data. To do so, special method ``migrate_data`` is used.
 
 Type conversions
 ^^^^^^^^^^^^^^^^
@@ -126,6 +176,12 @@ By default, it parses rows into python dictionary. In addition, the following ps
 Basic flows
 -----------
 
+By default package build operations are performed with ``PACKAGER`` which is specified in ``makepkg.conf``, however, it is possible to override this variable from command line; in this case service performs lookup in the following way:
+
+* If packager is not set, it reads environment variables (e.g. ``SUDO_USER`` and ``USER``), otherwise it uses value from command line.
+* It checks users for the specified username and tries to extract packager variable from it.
+* If packager value has been found, it will be passed as ``PACKAGER`` system variable (sudo configuration required).
+
 Add new packages or rebuild existing
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -135,12 +191,12 @@ Idea is to copy package to the directory from which it will be handled at the ne
 * If supplied argument is directory and there is ``PKGBUILD`` file there it will be treated as local package. In this case it will queue this package to build and copy source files (``PKGBUILD`` and ``.SRCINFO``) to caches.
 * If supplied argument is not file then application tries to lookup for the specified name in AUR and clones it into the directory with manual updates. This scenario can also handle package dependencies which are missing in repositories.
 
-This logic can be overwritten by specifying the ``source`` parameter, which is partially useful if you would like to add package from AUR, but there is local directory cloned from AUR.
+This logic can be overwritten by specifying the ``source`` parameter, which is partially useful if you would like to add package from AUR, but there is local directory cloned from AUR. Also official repositories calls are hidden behind explicit source definition.
 
 Rebuild packages
 ^^^^^^^^^^^^^^^^
 
-Same as add function for every package in repository. Optional filter by reverse dependency can be supplied.
+Same as add function for every package in repository. Optional filters by reverse dependency or build status can be supplied.
 
 Remove packages
 ^^^^^^^^^^^^^^^
@@ -158,6 +214,7 @@ This feature is divided into to stages: check AUR for updates and run rebuild fo
 #. For each level of tree it does:
 
    #. Download package data from AUR.
+   #. Bump ``pkgrel`` if there is duplicate version in the local repository (see explanation below).
    #. Build every package in clean chroot.
    #. Sign packages if required.
    #. Add packages to database and sign database if required.
@@ -165,18 +222,32 @@ This feature is divided into to stages: check AUR for updates and run rebuild fo
 
 After any step any package data is being removed.
 
+pkgrel bump rules
+^^^^^^^^^^^^^^^^^
+
+The application is able to automatically bump package release (``pkgrel``) during build process if there is duplicate version in repository. The version will be incremented as following:
+
+#. Get version of the remote package.
+#. Get version of the local package if any.
+#. If local version is not set, proceed with remote one.
+#. If local version is set and epoch or package version (``pkgver``) are different, proceed with remote version.
+#. If local version is set and remote version is newer than local one, proceed with remote.
+#. Extract ``pkgrel`` value.
+#. If it has ``major.minor`` notation (e.g. ``1.1``), then increment last part by 1, e.g. ``1.1 -> 1.2``, ``1.0.1 -> 1.0.2``.
+#. If ``pkgrel`` is a number (e.g. ``1``), then append 1 to the end of the string, e.g. ``1 -> 1.1``.
+
 Core functions reference
 ------------------------
 
 Configuration
 ^^^^^^^^^^^^^
 
-``ahriman.core.configuration.Configuration`` class provides some additional methods (e.g. ``getpath`` and ``getlist``) and also combines multiple files into single configuration dictionary using architecture overrides. It is the recommended way to deal with settings.
+``ahriman.core.configuration.Configuration`` class provides some additional methods (e.g. ``getpath`` and ``getlist``) and also combines multiple files into single configuration dictionary using repository identifier overrides. It is the recommended way to deal with settings.
 
 Enumerations
 ^^^^^^^^^^^^
 
-All enumerations are derived from ``str`` and ``enum.Enum``. Integer enumerations are not allowed, because most of operations require conversions from string variable. Derivation from string class is required to make json conversions implicitly (e.g. during calling ``json.dumps`` methods).
+All enumerations are derived from ``str`` and ``enum.Enum``. Integer enumerations in general are not allowed, because most of operations require conversions from string variable. Derivation from string class is required to make json conversions implicitly (e.g. during calling ``json.dumps`` methods).
 
 In addition, some enumerations provide ``from_option`` class methods in order to allow some flexibility while reading configuration options.
 
@@ -190,7 +261,7 @@ Context variables
 
 Package provides implicit global variables which can be accessed from ``ahriman.core`` package as ``context`` variable, wrapped by ``contextvars.ContextVar`` class. The value of the variable is defaulting to private ``_Context`` class which is defined in the same module. The default values - such as ``database`` and ``sign`` - are being set on the service initialization.
 
-The ``_Context`` class itself mimics default collection interface (as is Mapping) and can be modified by ``_Context.set`` method. The stored variables can be achieved by ``_Context.get`` method, which is unlike default ``Mapping`` interface also performs type and presence checks.
+The ``_Context`` class itself mimics default collection interface (as is ``Mapping``) and can be modified by ``_Context.set`` method. The stored variables can be achieved by ``_Context.get`` method, which is unlike default ``Mapping`` interface also performs type and presence checks.
 
 In order to provide statically typed interface, the ``ahriman.models.context_key.ContextKey`` class is used for both ``_Content.get`` and ``_Content.set`` methods; the context instance itself, however, does not store information about types.
 
@@ -206,7 +277,7 @@ The package provides several authorization methods: disabled, based on configura
 
 Disabled (default) authorization provider just allows everything for everyone and does not have any specific configuration (it uses some default configuration parameters though). It also provides generic interface for derived classes.
 
-Mapping (aka configuration) provider uses hashed passwords with salt from the database in order to authenticate users. This provider also enables user permission checking (read/write) (authorization). Thus, it defines the following methods:
+Mapping (aka configuration) provider uses hashed passwords with optional salt from the database in order to authenticate users. This provider also enables user permission checking (read/write) (authorization). Thus, it defines the following methods:
 
 * ``check_credentials`` - user password validation (authentication).
 * ``verify_access`` - user permission validation (authorization).
@@ -224,9 +295,9 @@ OAuth provider uses library definitions (``aioauth-client``) in order *authentic
 
 OAuth's implementation also allows authenticating users via username + password (in the same way as mapping does) though it is not recommended for end-users and password must be left blank. In particular this feature can be used by service reporting (aka robots).
 
-In addition, web service checks the source socket used. In case if it belongs to ``socket.AF_UNIX`` family, it will skip any furher checks considering the request to be performed in safe environment (e.g. on the same physical machine). This feature, in particular is being used by the reporter instances in case if socket address is set in configuration.
+In addition, web service checks the source socket used. In case if it belongs to ``socket.AF_UNIX`` family, it will skip any further checks considering the request to be performed in safe environment (e.g. on the same physical machine). This feature, in particular is being used by the reporter instances in case if socket address is set in configuration.
 
-In order to configure users there are special commands.
+In order to configure users there are special subcommands.
 
 Triggers
 ^^^^^^^^
@@ -237,7 +308,7 @@ The main idea is to load classes by their full path (e.g. ``ahriman.core.upload.
 
 The loaded triggers will be called with ``ahriman.models.result.Result`` and ``list[Packages]`` arguments, which describes the process result and current repository packages respectively. Any exception raised will be suppressed and will generate an exception message in logs.
 
-In addition triggers can implement ``on_start`` and ``on_stop`` actions which will be called on the application start and right before the application exit. The ``on_start`` action is usually being called from handlers directly in order to make sure that no trigger will be run when it is not required (e.g. on user management). As soon as ``on_start`` action is called, the additional flag will be set; ``ahriman.core.triggers.TriggerLoader`` class implements ``__del__`` method in which, if the flag is set, the ``on_stop`` actions will be called.
+In addition triggers can implement ``on_start`` and ``on_stop`` actions which will be called on the application start and right before the application exit respectively. The ``on_start`` action is usually being called from handlers directly in order to make sure that no trigger will be run when it is not required (e.g. on user management). As soon as ``on_start`` action is called, the additional flag will be set; ``ahriman.core.triggers.TriggerLoader`` class implements ``__del__`` method in which, if the flag is set, the ``on_stop`` actions will be called.
 
 For more details how to deal with the triggers, refer to :doc:`documentation <triggers>` and modules descriptions.
 
@@ -248,7 +319,7 @@ There are several supported synchronization providers, currently they are ``rsyn
 
 ``rsync`` provider does not have any specific logic except for running external rsync application with configured arguments. The service does not handle SSH configuration, thus it has to be configured before running application manually.
 
-``s3`` provider uses ``boto3`` package and implements sync feature. The files are stored in architecture directory (e.g. if bucket is ``repository``, packages will be stored in ``repository/x86_64`` for the ``x86_64`` architecture), bucket must be created before any action and API key must have permissions to write to the bucket. No external configuration required. In order to upload only changed files the service compares calculated hashes with the Amazon ETags, used realization is described `here <https://teppen.io/2018/10/23/aws_s3_verify_etags/>`_.
+``s3`` provider uses ``boto3`` package and implements sync feature. The files are stored in architecture directory (e.g. if bucket is ``repository``, packages will be stored in ``repository/aur-clone/x86_64`` for the ``aur-clone`` repository ``x86_64`` architecture), bucket must be created before any action and API key must have permissions to write to the bucket. No external configuration required. In order to upload only changed files the service compares calculated hashes with the Amazon ETags, used realization is described `here <https://teppen.io/2018/10/23/aws_s3_verify_etags/>`_.
 
 ``github`` provider authenticates through basic auth, API key with repository write permissions is required. There will be created a release with the name of the architecture in case if it does not exist; files will be uploaded to the release assets. It also stores array of files and their MD5 checksums in release body in order to upload only changed ones. According to the Github API in case if there is already uploaded asset with the same name (e.g. database files), asset will be removed first.
 
@@ -297,9 +368,11 @@ REST API supports both form and JSON data, but the last one is recommended.
 Different APIs are separated into different packages:
 
 * ``ahriman.web.views.api`` not a real API, but some views which provide OpenAPI support.
-* ``ahriman.web.views.service`` provides views for application controls.
-* ``ahriman.web.views.status`` package provides REST API for application reporting.
-* ``ahriman.web.views.user`` package provides login and logout methods which can be called without authorization.
+* ``ahriman.web.views.*.service`` provides views for application controls.
+* ``ahriman.web.views.*.status`` package provides REST API for application reporting.
+* ``ahriman.web.views.*.user`` package provides login and logout methods which can be called without authorization.
+
+The views are also divided by supporting API versions (e.g. ``v1``, ``v2``).
 
 Templating
 ^^^^^^^^^^
@@ -319,3 +392,5 @@ External calls
 ^^^^^^^^^^^^^^
 
 Web application provides external calls to control main service. It spawns child process with specific arguments and waits for its termination. This feature must be used either with authorization or in safe (i.e. when status page is not available world-wide) environment.
+
+For most actions it also extracts user from authentication (if provided) and passes it to underlying process.

docs/completions/zsh/_ahriman

@@ -1,638 +0,0 @@
-#compdef ahriman
-
-# AUTOMATICALLY GENERATED by `shtab`
-
-
-_shtab_ahriman_commands() {
-  local _commands=(
-    "add:add existing or new package to the build queue"
-    "aur-search:search for package in AUR using API"
-    "check:check for packages updates. Same as repo-update --dry-run --no-manual"
-    "clean:remove local caches"
-    "config:dump configuration for the specified architecture"
-    "config-validate:validate configuration and print found errors"
-    "daemon:start process which periodically will run update process"
-    "help:show help message for application or command and exit"
-    "help-commands-unsafe:list unsafe commands as defined in default args"
-    "help-updates:request AUR for current version and compare with current service version"
-    "help-version:print application and its dependencies versions"
-    "init:create initial service configuration, requires root"
-    "key-import:import PGP key from public sources to the repository user"
-    "package-add:add existing or new package to the build queue"
-    "package-remove:remove package from the repository"
-    "package-status:request status of the package"
-    "package-status-remove:remove the package from the status page"
-    "package-status-update:update package status on the status page"
-    "package-update:add existing or new package to the build queue"
-    "patch-add:create or update patched PKGBUILD function or variable"
-    "patch-list:list available patches for the package"
-    "patch-remove:remove patches for the package"
-    "patch-set-add:create or update source patches"
-    "rebuild:force rebuild whole repository"
-    "remove:remove package from the repository"
-    "remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
-    "repo-backup:backup repository settings and database"
-    "repo-check:check for packages updates. Same as repo-update --dry-run --no-manual"
-    "repo-clean:remove local caches"
-    "repo-config:dump configuration for the specified architecture"
-    "repo-config-validate:validate configuration and print found errors"
-    "repo-daemon:start process which periodically will run update process"
-    "repo-init:create initial service configuration, requires root"
-    "repo-rebuild:force rebuild whole repository"
-    "repo-remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
-    "repo-report:generate repository report according to current settings"
-    "repo-restore:restore settings and database"
-    "repo-setup:create initial service configuration, requires root"
-    "repo-sign:(re-)sign packages and repository database according to current settings"
-    "repo-status-update:update repository status on the status page"
-    "repo-sync:sync repository files to remote server according to current settings"
-    "repo-tree:dump repository tree based on packages dependencies"
-    "repo-triggers:run triggers on empty build result as configured by settings"
-    "repo-update:check for packages updates and run build process if requested"
-    "report:generate repository report according to current settings"
-    "search:search for package in AUR using API"
-    "service-clean:remove local caches"
-    "service-config:dump configuration for the specified architecture"
-    "service-config-validate:validate configuration and print found errors"
-    "service-key-import:import PGP key from public sources to the repository user"
-    "service-setup:create initial service configuration, requires root"
-    "service-shell:drop into python shell while having created application"
-    "setup:create initial service configuration, requires root"
-    "shell:drop into python shell while having created application"
-    "sign:(re-)sign packages and repository database according to current settings"
-    "status:request status of the package"
-    "status-update:update package status on the status page"
-    "sync:sync repository files to remote server according to current settings"
-    "update:check for packages updates and run build process if requested"
-    "user-add:update user for web services with the given password and role. In case if password was not entered it will be asked interactively"
-    "user-list:list users from the user mapping and their roles"
-    "user-remove:remove user from the user mapping and update the configuration"
-    "version:print application and its dependencies versions"
-    "web:start web server"
-  )
-  _describe 'ahriman commands' _commands
-}
-
-_shtab_ahriman_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "*"{-a,--architecture}"[target architectures. For several subcommands it can be used multiple times]:architecture:"
-  {-c,--configuration}"[configuration path]:configuration:"
-  "--force[force run, remove file lock]"
-  {-l,--lock}"[lock file]:lock:"
-  {--report,--no-report}"[force enable or disable reporting to web service (default\: \%(default)s)]:report:"
-  {-q,--quiet}"[force disable any logging]"
-  "--unsafe[allow to run ahriman as non-ahriman user. Some actions might be unavailable]"
-  "(- : *)"{-V,--version}"[show program\'s version number and exit]"
-)
-
-_shtab_ahriman_add_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {-n,--now}"[run update function after]"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  {-s,--source}"[explicitly specify the package source for this command]:source:(auto archive aur directory local remote repository)"
-  "(*):package source (base name, path to local files, remote URL):"
-)
-
-_shtab_ahriman_aur_search_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--info,--no-info}"[show additional package information (default\: \%(default)s)]:info:"
-  "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
-  "(*):search terms, can be specified multiple times, the result will match all terms:"
-)
-
-_shtab_ahriman_check_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: \%(default)s)]:vcs:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  "(*)::filter check by package base:"
-)
-
-_shtab_ahriman_clean_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: \%(default)s)]:cache:"
-  {--chroot,--no-chroot}"[clear build chroot (default\: \%(default)s)]:chroot:"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: \%(default)s)]:manual:"
-  {--packages,--no-packages}"[clear directory with built packages (default\: \%(default)s)]:packages:"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: \%(default)s)]:pacman:"
-)
-
-_shtab_ahriman_config_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: \%(default)s)]:secure:"
-)
-
-_shtab_ahriman_config_validate_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if configuration is invalid]"
-)
-
-_shtab_ahriman_daemon_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-i,--interval}"[interval between runs in seconds]:interval:"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: \%(default)s)]:aur:"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: \%(default)s)]:local:"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: \%(default)s)]:manual:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: \%(default)s)]:vcs:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-)
-
-_shtab_ahriman_help_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":show help message for specific command:"
-)
-
-_shtab_ahriman_help_commands_unsafe_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--command[instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1 otherwise]:command:"
-)
-
-_shtab_ahriman_help_updates_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit code if updates available]"
-)
-
-_shtab_ahriman_help_version_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_init_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
-  "--build-command[build command prefix]:build_command:"
-  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: \%(default)s)]:makeflags_jobs:"
-  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: \%(default)s)]:multilib:"
-  "--packager[packager name and email]:packager:"
-  "--repository[repository name]:repository:"
-  "--sign-key[sign key id]:sign_key:"
-  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
-  "--web-port[port of the web service]:web_port:"
-  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
-)
-
-_shtab_ahriman_key_import_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--key-server[key server for key import]:key_server:"
-  ":PGP key to import from public server:"
-)
-
-_shtab_ahriman_package_add_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {-n,--now}"[run update function after]"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  {-s,--source}"[explicitly specify the package source for this command]:source:(auto archive aur directory local remote repository)"
-  "(*):package source (base name, path to local files, remote URL):"
-)
-
-_shtab_ahriman_package_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):package name or base:"
-)
-
-_shtab_ahriman_package_status_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--ahriman[get service status itself]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--info,--no-info}"[show additional package information (default\: \%(default)s)]:info:"
-  {-s,--status}"[filter packages by status]:status:(unknown pending building failed success)"
-  "(*)::filter status by package base:"
-)
-
-_shtab_ahriman_package_status_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):remove specified packages from status page:"
-)
-
-_shtab_ahriman_package_status_update_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-s,--status}"[new package build status]:status:(unknown pending building failed success)"
-  "(*)::set status for specified packages. If no packages supplied, service status will be updated:"
-)
-
-_shtab_ahriman_package_update_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {-n,--now}"[run update function after]"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  {-s,--source}"[explicitly specify the package source for this command]:source:(auto archive aur directory local remote repository)"
-  "(*):package source (base name, path to local files, remote URL):"
-)
-
-_shtab_ahriman_patch_add_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":package base:"
-  ":PKGBUILD variable or function name. If variable is a function, it must end with ():"
-  ":path to file which contains function or variable value. If not set, the value will be read from stdin:"
-)
-
-_shtab_ahriman_patch_list_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  "*"{-v,--variable}"[if set, show only patches for specified PKGBUILD variables]:variable:"
-  ":package base:"
-)
-
-_shtab_ahriman_patch_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "*"{-v,--variable}"[should be used for single-function patches in case if you wold like to remove only specified PKGBUILD variables. In case if not set, it will remove all patches related to the package]:variable:"
-  ":package base:"
-)
-
-_shtab_ahriman_patch_set_add_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "*"{-t,--track}"[files which has to be tracked]:track:"
-  ":path to directory with changed files for patch addition\/update:"
-)
-
-_shtab_ahriman_rebuild_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "*--depends-on[only rebuild packages that depend on specified packages]:depends_on:"
-  "--dry-run[just perform check for packages without rebuild process itself]"
-  "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once.]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-)
-
-_shtab_ahriman_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):package name or base:"
-)
-
-_shtab_ahriman_remove_unknown_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--dry-run[just perform check for packages without removal]"
-)
-
-_shtab_ahriman_repo_backup_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":path of the output archive:"
-)
-
-_shtab_ahriman_repo_check_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: \%(default)s)]:vcs:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  "(*)::filter check by package base:"
-)
-
-_shtab_ahriman_repo_clean_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: \%(default)s)]:cache:"
-  {--chroot,--no-chroot}"[clear build chroot (default\: \%(default)s)]:chroot:"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: \%(default)s)]:manual:"
-  {--packages,--no-packages}"[clear directory with built packages (default\: \%(default)s)]:packages:"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: \%(default)s)]:pacman:"
-)
-
-_shtab_ahriman_repo_config_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: \%(default)s)]:secure:"
-)
-
-_shtab_ahriman_repo_config_validate_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if configuration is invalid]"
-)
-
-_shtab_ahriman_repo_daemon_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-i,--interval}"[interval between runs in seconds]:interval:"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: \%(default)s)]:aur:"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: \%(default)s)]:local:"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: \%(default)s)]:manual:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: \%(default)s)]:vcs:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-)
-
-_shtab_ahriman_repo_init_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
-  "--build-command[build command prefix]:build_command:"
-  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: \%(default)s)]:makeflags_jobs:"
-  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: \%(default)s)]:multilib:"
-  "--packager[packager name and email]:packager:"
-  "--repository[repository name]:repository:"
-  "--sign-key[sign key id]:sign_key:"
-  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
-  "--web-port[port of the web service]:web_port:"
-  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
-)
-
-_shtab_ahriman_repo_rebuild_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "*--depends-on[only rebuild packages that depend on specified packages]:depends_on:"
-  "--dry-run[just perform check for packages without rebuild process itself]"
-  "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once.]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-)
-
-_shtab_ahriman_repo_remove_unknown_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--dry-run[just perform check for packages without removal]"
-)
-
-_shtab_ahriman_repo_report_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_repo_restore_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-o,--output}"[root path of the extracted files]:output:"
-  ":path of the input archive:"
-)
-
-_shtab_ahriman_repo_setup_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
-  "--build-command[build command prefix]:build_command:"
-  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: \%(default)s)]:makeflags_jobs:"
-  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: \%(default)s)]:multilib:"
-  "--packager[packager name and email]:packager:"
-  "--repository[repository name]:repository:"
-  "--sign-key[sign key id]:sign_key:"
-  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
-  "--web-port[port of the web service]:web_port:"
-  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
-)
-
-_shtab_ahriman_repo_sign_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*)::sign only specified packages:"
-)
-
-_shtab_ahriman_repo_status_update_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-s,--status}"[new status]:status:(unknown pending building failed success)"
-)
-
-_shtab_ahriman_repo_sync_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_repo_tree_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_repo_triggers_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*)::instead of running all triggers as set by configuration, just process specified ones in order of mention:"
-)
-
-_shtab_ahriman_repo_update_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: \%(default)s)]:aur:"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  "--dry-run[just perform check for updates, same as check command]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: \%(default)s)]:local:"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: \%(default)s)]:manual:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: \%(default)s)]:vcs:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  "(*)::filter check by package base:"
-)
-
-_shtab_ahriman_report_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_search_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--info,--no-info}"[show additional package information (default\: \%(default)s)]:info:"
-  "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
-  "(*):search terms, can be specified multiple times, the result will match all terms:"
-)
-
-_shtab_ahriman_service_clean_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: \%(default)s)]:cache:"
-  {--chroot,--no-chroot}"[clear build chroot (default\: \%(default)s)]:chroot:"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: \%(default)s)]:manual:"
-  {--packages,--no-packages}"[clear directory with built packages (default\: \%(default)s)]:packages:"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: \%(default)s)]:pacman:"
-)
-
-_shtab_ahriman_service_config_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: \%(default)s)]:secure:"
-)
-
-_shtab_ahriman_service_config_validate_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if configuration is invalid]"
-)
-
-_shtab_ahriman_service_key_import_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--key-server[key server for key import]:key_server:"
-  ":PGP key to import from public server:"
-)
-
-_shtab_ahriman_service_setup_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
-  "--build-command[build command prefix]:build_command:"
-  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: \%(default)s)]:makeflags_jobs:"
-  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: \%(default)s)]:multilib:"
-  "--packager[packager name and email]:packager:"
-  "--repository[repository name]:repository:"
-  "--sign-key[sign key id]:sign_key:"
-  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
-  "--web-port[port of the web service]:web_port:"
-  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
-)
-
-_shtab_ahriman_service_shell_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":instead of dropping into shell, just execute the specified code:"
-)
-
-_shtab_ahriman_setup_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
-  "--build-command[build command prefix]:build_command:"
-  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: \%(default)s)]:makeflags_jobs:"
-  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: \%(default)s)]:multilib:"
-  "--packager[packager name and email]:packager:"
-  "--repository[repository name]:repository:"
-  "--sign-key[sign key id]:sign_key:"
-  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
-  "--web-port[port of the web service]:web_port:"
-  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
-)
-
-_shtab_ahriman_shell_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":instead of dropping into shell, just execute the specified code:"
-)
-
-_shtab_ahriman_sign_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*)::sign only specified packages:"
-)
-
-_shtab_ahriman_status_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "--ahriman[get service status itself]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--info,--no-info}"[show additional package information (default\: \%(default)s)]:info:"
-  {-s,--status}"[filter packages by status]:status:(unknown pending building failed success)"
-  "(*)::filter status by package base:"
-)
-
-_shtab_ahriman_status_update_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-s,--status}"[new package build status]:status:(unknown pending building failed success)"
-  "(*)::set status for specified packages. If no packages supplied, service status will be updated:"
-)
-
-_shtab_ahriman_sync_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_update_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: \%(default)s)]:aur:"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: \%(default)s)]:dependencies:"
-  "--dry-run[just perform check for updates, same as check command]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: \%(default)s)]:local:"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: \%(default)s)]:manual:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: \%(default)s)]:vcs:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
-  "(*)::filter check by package base:"
-)
-
-_shtab_ahriman_user_add_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-p,--password}"[user password. Blank password will be treated as empty password, which is in particular must be used for OAuth2 authorization type.]:password:"
-  {-r,--role}"[user access level]:role:(unauthorized read reporter full)"
-  {-s,--secure}"[set file permissions to user-only]"
-  ":username for web service:"
-)
-
-_shtab_ahriman_user_list_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty]"
-  {-r,--role}"[filter users by role]:role:(unauthorized read reporter full)"
-  ":filter users by username:"
-)
-
-_shtab_ahriman_user_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":username for web service:"
-)
-
-_shtab_ahriman_version_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-_shtab_ahriman_web_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-
-_shtab_ahriman() {
-  local context state line curcontext="$curcontext" one_or_more='(-)*' remainder='(*)'
-
-  if ((${_shtab_ahriman_options[(I)${(q)one_or_more}*]} + ${_shtab_ahriman_options[(I)${(q)remainder}*]} == 0)); then  # noqa: E501
-    _shtab_ahriman_options+=(': :_shtab_ahriman_commands' '*::: :->ahriman')
-  fi
-  _arguments -C $_shtab_ahriman_options
-
-  case $state in
-    ahriman)
-      words=($line[1] "${words[@]}")
-      (( CURRENT += 1 ))
-      curcontext="${curcontext%:*:*}:_shtab_ahriman-$line[1]:"
-      case $line[1] in
-        add) _arguments -C $_shtab_ahriman_add_options ;;
-        aur-search) _arguments -C $_shtab_ahriman_aur_search_options ;;
-        check) _arguments -C $_shtab_ahriman_check_options ;;
-        clean) _arguments -C $_shtab_ahriman_clean_options ;;
-        config) _arguments -C $_shtab_ahriman_config_options ;;
-        config-validate) _arguments -C $_shtab_ahriman_config_validate_options ;;
-        daemon) _arguments -C $_shtab_ahriman_daemon_options ;;
-        help) _arguments -C $_shtab_ahriman_help_options ;;
-        help-commands-unsafe) _arguments -C $_shtab_ahriman_help_commands_unsafe_options ;;
-        help-updates) _arguments -C $_shtab_ahriman_help_updates_options ;;
-        help-version) _arguments -C $_shtab_ahriman_help_version_options ;;
-        init) _arguments -C $_shtab_ahriman_init_options ;;
-        key-import) _arguments -C $_shtab_ahriman_key_import_options ;;
-        package-add) _arguments -C $_shtab_ahriman_package_add_options ;;
-        package-remove) _arguments -C $_shtab_ahriman_package_remove_options ;;
-        package-status) _arguments -C $_shtab_ahriman_package_status_options ;;
-        package-status-remove) _arguments -C $_shtab_ahriman_package_status_remove_options ;;
-        package-status-update) _arguments -C $_shtab_ahriman_package_status_update_options ;;
-        package-update) _arguments -C $_shtab_ahriman_package_update_options ;;
-        patch-add) _arguments -C $_shtab_ahriman_patch_add_options ;;
-        patch-list) _arguments -C $_shtab_ahriman_patch_list_options ;;
-        patch-remove) _arguments -C $_shtab_ahriman_patch_remove_options ;;
-        patch-set-add) _arguments -C $_shtab_ahriman_patch_set_add_options ;;
-        rebuild) _arguments -C $_shtab_ahriman_rebuild_options ;;
-        remove) _arguments -C $_shtab_ahriman_remove_options ;;
-        remove-unknown) _arguments -C $_shtab_ahriman_remove_unknown_options ;;
-        repo-backup) _arguments -C $_shtab_ahriman_repo_backup_options ;;
-        repo-check) _arguments -C $_shtab_ahriman_repo_check_options ;;
-        repo-clean) _arguments -C $_shtab_ahriman_repo_clean_options ;;
-        repo-config) _arguments -C $_shtab_ahriman_repo_config_options ;;
-        repo-config-validate) _arguments -C $_shtab_ahriman_repo_config_validate_options ;;
-        repo-daemon) _arguments -C $_shtab_ahriman_repo_daemon_options ;;
-        repo-init) _arguments -C $_shtab_ahriman_repo_init_options ;;
-        repo-rebuild) _arguments -C $_shtab_ahriman_repo_rebuild_options ;;
-        repo-remove-unknown) _arguments -C $_shtab_ahriman_repo_remove_unknown_options ;;
-        repo-report) _arguments -C $_shtab_ahriman_repo_report_options ;;
-        repo-restore) _arguments -C $_shtab_ahriman_repo_restore_options ;;
-        repo-setup) _arguments -C $_shtab_ahriman_repo_setup_options ;;
-        repo-sign) _arguments -C $_shtab_ahriman_repo_sign_options ;;
-        repo-status-update) _arguments -C $_shtab_ahriman_repo_status_update_options ;;
-        repo-sync) _arguments -C $_shtab_ahriman_repo_sync_options ;;
-        repo-tree) _arguments -C $_shtab_ahriman_repo_tree_options ;;
-        repo-triggers) _arguments -C $_shtab_ahriman_repo_triggers_options ;;
-        repo-update) _arguments -C $_shtab_ahriman_repo_update_options ;;
-        report) _arguments -C $_shtab_ahriman_report_options ;;
-        search) _arguments -C $_shtab_ahriman_search_options ;;
-        service-clean) _arguments -C $_shtab_ahriman_service_clean_options ;;
-        service-config) _arguments -C $_shtab_ahriman_service_config_options ;;
-        service-config-validate) _arguments -C $_shtab_ahriman_service_config_validate_options ;;
-        service-key-import) _arguments -C $_shtab_ahriman_service_key_import_options ;;
-        service-setup) _arguments -C $_shtab_ahriman_service_setup_options ;;
-        service-shell) _arguments -C $_shtab_ahriman_service_shell_options ;;
-        setup) _arguments -C $_shtab_ahriman_setup_options ;;
-        shell) _arguments -C $_shtab_ahriman_shell_options ;;
-        sign) _arguments -C $_shtab_ahriman_sign_options ;;
-        status) _arguments -C $_shtab_ahriman_status_options ;;
-        status-update) _arguments -C $_shtab_ahriman_status_update_options ;;
-        sync) _arguments -C $_shtab_ahriman_sync_options ;;
-        update) _arguments -C $_shtab_ahriman_update_options ;;
-        user-add) _arguments -C $_shtab_ahriman_user_add_options ;;
-        user-list) _arguments -C $_shtab_ahriman_user_list_options ;;
-        user-remove) _arguments -C $_shtab_ahriman_user_remove_options ;;
-        version) _arguments -C $_shtab_ahriman_version_options ;;
-        web) _arguments -C $_shtab_ahriman_web_options ;;
-      esac
-  esac
-}
-
-
-
-typeset -A opt_args
-_shtab_ahriman "$@"

docs/conf.py

@@ -14,9 +14,8 @@ import os
 import sys
 
 from pathlib import Path
-from unittest import mock
 
-from ahriman.version import __version__
+from ahriman import __version__
 
 
 basedir = Path(__file__).resolve().parent.parent / "src"
@@ -24,13 +23,6 @@ sys.path.insert(0, str(basedir))
 
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
-for module in (
-        "pyalpm",
-):
-    if module in sys.modules:
-        continue
-    sys.modules[module] = mock.Mock()
-
 
 # -- Project information -----------------------------------------------------
 
@@ -50,6 +42,7 @@ release = __version__
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.napoleon",
+    "sphinx_rtd_theme",
     "sphinxarg.ext",
 ]
 
@@ -74,7 +67,7 @@ exclude_patterns = []
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = "default" if on_rtd else "alabaster"
+html_theme = "sphinx_rtd_theme"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -92,6 +85,8 @@ autoclass_content = "both"
 
 autodoc_member_order = "groupwise"
 
+autodoc_mock_imports = ["cryptography", "pyalpm"]
+
 autodoc_default_options = {
     "no-undoc-members": True,
 }

docs/configuration.rst

@@ -1,7 +1,12 @@
 Configuration
 =============
 
-Some groups can be specified for each architecture separately. E.g. if there are ``build`` and ``build:x86_64`` groups it will use an option from ``build:x86_64`` for the ``x86_64`` architecture and ``build`` for any other (architecture specific group has higher priority). In case if both groups are presented, architecture specific options will be merged into global ones overriding them.
+Some groups can be specified for each architecture and/or repository separately. E.g. if there are ``build`` and ``build:x86_64`` groups it will use an option from ``build:x86_64`` for the ``x86_64`` architecture and ``build`` for any other (architecture specific group has higher priority). In case if both groups are presented, architecture specific options will be merged into global ones overriding them. The order which will be used for option resolution is the following:
+
+#. Repository and architecture specific, e.g. ``build:aur-clone:x86_64``.
+#. Repository specific, e.g. ``build:aur-clone``.
+#. Architecture specific, e.g. ``build:x86_64``.
+#. Default section, e.g. ``build``.
 
 There are two variable types which have been added to default ones, they are paths and lists. List values will be read in the same way as shell does:
 
@@ -12,11 +17,20 @@ There are two variable types which have been added to default ones, they are pat
 
 Path values, except for casting to ``pathlib.Path`` type, will be also expanded to absolute paths relative to the configuration path. E.g. if path is set to ``ahriman.ini.d/logging.ini`` and root configuration path is ``/etc/ahriman.ini``, the value will be expanded to ``/etc/ahriman.ini.d/logging.ini``. In order to disable path expand, use the full path, e.g. ``/etc/ahriman.ini.d/logging.ini``.
 
+Configuration allows string interpolation from environment variables, e.g.:
+
+.. code-block:: ini
+
+   [section]
+   key = $SECRET
+
+will try to read value from ``SECRET`` environment variable. In case if the required environment variable wasn't found, it will keep original value (i.e. ``$SECRET`` in the example). Dollar sign can be set as ``$$``.
+
 There is also additional subcommand which will allow to validate configuration and print found errors. In order to do so, run ``service-config-validate`` subcommand, e.g.:
 
 .. code-block:: shell
 
-   ahriman -a x86_64 service-config-validate
+   ahriman service-config-validate
 
 It will check current settings on common errors and compare configuration with known schema.
 
@@ -25,13 +39,14 @@ It will check current settings on common errors and compare configuration with k
 
 Base configuration settings.
 
-* ``include`` - path to directory with configuration files overrides, string, required.
+* ``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 automatically.
 * ``database`` - path to SQLite database, string, required.
+* ``include`` - path to directory with configuration files overrides, string, optional.
 * ``logging`` - path to logging configuration, string, required. Check ``logging.ini`` for reference.
 * ``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.
 
-``alpm`` group
---------------
+``alpm:*`` groups
+-----------------
 
 libalpm and AUR related configuration. Group name can refer to architecture, e.g. ``alpm:x86_64`` can be used for x86_64 architecture specific settings.
 
@@ -52,9 +67,10 @@ Base authorization settings. ``OAuth`` provider requires ``aioauth-client`` libr
 * ``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 expired during restart.
 * ``max_age`` - parameter which controls both cookie expiration and token expiration inside the service, 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.
 * ``oauth_scopes`` - scopes list for OAuth2 provider, which will allow retrieving user email (which is used for checking user permissions), e.g. ``https://www.googleapis.com/auth/userinfo.email`` for ``GoogleClient`` or ``user:email`` for ``GithubClient``, space separated list of strings, required in case if ``oauth`` is used.
-* ``salt`` - password hash salt, string, required in case if authorization enabled (automatically generated by ``user-add`` subcommand).
+* ``salt`` - additional password hash salt, string, optional.
 
 Authorized users are stored inside internal database, if any of external provides are used the password field for non-service users must be empty. 
 
@@ -69,6 +85,7 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
 * ``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 mention.
+* ``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, int, optional, default ``604800``.
 
 ``repository`` group
@@ -76,7 +93,6 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
 
 Base repository settings.
 
-* ``name`` - repository name, string, required.
 * ``root`` - root path for application, string, required.
 
 ``sign:*`` groups
@@ -86,26 +102,66 @@ Settings for signing packages or repository. Group name can refer to architectur
 
 * ``target`` - configuration flag to enable signing, space separated list of strings, required. Allowed values are ``package`` (sign each package separately), ``repository`` (sign repository database file).
 * ``key`` - default PGP key, string, required. This key will also be used for database signing if enabled.
-* ``key_*`` settings - PGP key which will be used for specific packages, string, optional. For example, if there is ``key_yay`` option the specified key will be used for yay package and default key for others.
 
-``web:*`` groups
-----------------
+``web`` group
+-------------
 
-Web server settings. If any of ``host``/``port`` is not set, web integration will be disabled. Group name can refer to architecture, e.g. ``web:x86_64`` can be used for x86_64 architecture specific settings. This feature requires ``aiohttp`` libraries to be installed.
+Web server settings. If any of ``host``/``port`` is not set, web integration will be disabled. 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.
 * ``debug`` - enable debug toolbar, boolean, optional, default ``no``.
 * ``debug_check_host`` - check hosts to access debug toolbar, boolean, optional, default ``no``.
 * ``debug_allowed_hosts`` - allowed hosts to get access to debug toolbar, space separated list of string, optional.
+* ``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.
+* ``max_body_size`` - max body size in bytes to be validated for archive upload, integer, optional. If not set, validation will be disabled.
 * ``password`` - password to authorize in web service in order to update service status, string, required in case if authorization enabled.
 * ``port`` - port to bind, int, optional.
 * ``static_path`` - path to directory with static files, string, required.
-* ``templates`` - path to templates directory, string, required.
+* ``templates`` - path to templates directories, space separated list of strings, required.
+* ``timeout`` - HTTP request timeout in seconds, int, optional, default is ``30``.
 * ``unix_socket`` - path to the listening unix socket, string, optional. If set, server will create the socket on the specified address which can (and will) be used by application. Note, that unlike usual host/port configuration, unix socket allows to perform requests without authorization.
 * ``unix_socket_unsafe`` - set unsafe (o+w) permissions to unix socket, boolean, optional, default ``yes``. This option is enabled by default, because it is supposed that unix socket is created in safe environment (only web service is supposed to be used in unsafe), but it can be disabled by configuration.
 * ``username`` - username to authorize in web service in order to update service status, string, required in case if authorization enabled.
+* ``wait_timeout`` - wait timeout in seconds, maximum amount of time to be waited before lock will be free, int, optional.
+
+``keyring`` group
+--------------------
+
+Keyring package generator plugin.
+
+* ``target`` - list of generator settings sections, space separated list of strings, required. It must point to valid section name.
+
+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.
+* ``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.
+* ``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.
+
+``mirrorlist`` group
+--------------------
+
+Mirrorlist package generator plugin.
+
+* ``target`` - list of generator settings sections, space separated list of strings, required. It must point to valid section name.
+
+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.
+* ``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.
+* ``servers`` - list of repository mirrors, space separated list of strings, required.
 
 ``remote-pull`` group
 ---------------------
@@ -144,7 +200,8 @@ Available options are:
 Remote push trigger
 ^^^^^^^^^^^^^^^^^^^
 
-* ``commit_author`` - git commit author, string, optional. In case if not set, the git will generate author for you. Note, however, that in this case it will disclosure your hostname.
+* ``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_branch`` - branch of the remote repository to which PKGBUILDs should be pushed after build process, string, optional, default is ``master``.
 
@@ -175,7 +232,6 @@ Section name must be either ``console`` (plus optional architecture name, e.g. `
 Section name must be either ``email`` (plus optional architecture name, e.g. ``email:x86_64``) or random name with ``type`` set.
 
 * ``type`` - type of the report, string, optional, must be set to ``email`` if exists.
-* ``full_template_path`` - path to Jinja2 template for full package description index, string, optional.
 * ``homepage`` - link to homepage, string, optional.
 * ``host`` - SMTP host for sending emails, string, required.
 * ``link_path`` - prefix for HTML links, string, required.
@@ -185,7 +241,9 @@ Section name must be either ``email`` (plus optional architecture name, e.g. ``e
 * ``receivers`` - SMTP receiver addresses, space separated list of strings, required.
 * ``sender`` - SMTP sender address, string, required.
 * ``ssl`` - SSL mode for SMTP connection, one of ``ssl``, ``starttls``, ``disabled``, optional, default ``disabled``.
-* ``template_path`` - path to Jinja2 template, string, required.
+* ``template`` - Jinja2 template name, string, required.
+* ``template_full`` - Jinja2 template name for full package description index, string, optional.
+* ``templates`` - path to templates directories, space separated list of strings, required.
 * ``user`` - SMTP user to authenticate, string, optional.
 
 ``html`` type
@@ -197,7 +255,19 @@ Section name must be either ``html`` (plus optional architecture name, e.g. ``ht
 * ``homepage`` - link to homepage, string, optional.
 * ``link_path`` - prefix for HTML links, string, required.
 * ``path`` - path to html report file, string, required.
-* ``template_path`` - path to Jinja2 template, string, required.
+* ``template`` - Jinja2 template name, string, required.
+* ``templates`` - path to templates directories, space separated list of strings, required.
+
+``remote-call`` type
+^^^^^^^^^^^^^^^^^^^^
+
+Section name must be either ``remote-call`` (plus optional architecture name, e.g. ``remote-call:x86_64``) or random name with ``type`` set.
+
+* ``type`` - type of the report, string, optional, must be set to ``remote-call`` if exists.
+* ``aur`` - check for AUR packages updates, boolean, optional, default ``no``.
+* ``local`` - check for local packages updates, boolean, optional, default ``no``.
+* ``manual`` - update manually built packages, boolean, optional, default ``no``.
+* ``wait_timeout`` - maximum amount of time in seconds to be waited before remote process will be terminated, int, optional, default ``-1``.
 
 ``telegram`` type
 ^^^^^^^^^^^^^^^^^
@@ -209,8 +279,9 @@ Section name must be either ``telegram`` (plus optional architecture name, e.g.
 * ``chat_id`` - telegram chat id, either string with ``@`` or integer value, required.
 * ``homepage`` - link to homepage, string, optional.
 * ``link_path`` - prefix for HTML links, string, required.
-* ``template_path`` - path to Jinja2 template, string, required.
+* ``template`` - Jinja2 template name, string, required.
 * ``template_type`` - ``parse_mode`` to be passed to telegram API, one of ``MarkdownV2``, ``HTML``, ``Markdown``, string, optional, default ``HTML``.
+* ``templates`` - path to templates directories, space separated list of strings, required.
 * ``timeout`` - HTTP request timeout in seconds, int, optional, default is ``30``.
 
 ``upload`` group
@@ -229,20 +300,29 @@ Type will be read from several sources:
 ``github`` type
 ^^^^^^^^^^^^^^^
 
-This feature requires Github key creation (see below). Section name must be either ``github`` (plus optional architecture name, e.g. ``github:x86_64``) or random name with ``type`` set.
+This feature requires GitHub key creation (see below). Section name must be either ``github`` (plus optional architecture name, e.g. ``github:x86_64``) or random name with ``type`` set.
 
 * ``type`` - type of the upload, string, optional, must be set to ``github`` if exists.
-* ``owner`` - Github repository owner, string, required.
-* ``password`` - created Github API key. In order to create it do the following:
+* ``owner`` - GitHub repository owner, string, required.
+* ``password`` - created GitHub API key. In order to create it do the following:
 
   #. Go to `settings page <https://github.com/settings/profile>`_.
   #. Switch to `developers settings <https://github.com/settings/apps>`_.
   #. Switch to `personal access tokens <https://github.com/settings/tokens>`_.
   #. Generate new token. Required scope is ``public_repo`` (or ``repo`` for private repository support).
 
-* ``repository`` - Github repository name, string, required. Repository must be created before any action and must have active branch (e.g. with readme).
+* ``repository`` - GitHub repository name, string, required. Repository must be created before any action and must have active branch (e.g. with readme).
+* ``timeout`` - HTTP request timeout in seconds, int, optional, default is ``30``.
+* ``use_full_release_name`` - if set to ``yes``, the release will contain both repository name and architecture, and only architecture otherwise, boolean, optional, default ``no`` (legacy behavior).
+* ``username`` - GitHub authorization user, string, required. Basically the same as ``owner``.
+
+``remote-service`` type
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Section name must be either ``remote-service`` (plus optional architecture name, e.g. ``remote-service:x86_64``) or random name with ``type`` set.
+
+* ``type`` - type of the report, string, optional, must be set to ``remote-service`` if exists.
 * ``timeout`` - HTTP request timeout in seconds, int, optional, default is ``30``.
-* ``username`` - Github authorization user, string, required. Basically the same as ``owner``.
 
 ``rsync`` type
 ^^^^^^^^^^^^^^
@@ -258,9 +338,10 @@ Requires ``rsync`` package to be installed. Do not forget to configure ssh for u
 
 Requires ``boto3`` library to be installed. Section name must be either ``s3`` (plus optional architecture name, e.g. ``s3:x86_64``) or random name with ``type`` set.
 
-* ``type`` - type of the upload, string, optional, must be set to ``github`` if exists.
+* ``type`` - type of the upload, string, optional, must be set to ``s3`` if exists.
 * ``access_key`` - AWS access key ID, string, required.
 * ``bucket`` - bucket name (e.g. ``bucket``), string, required.
 * ``chunk_size`` - chunk size for calculating entity tags, int, optional, default 8 * 1024 * 1024.
+* ``object_path`` - path prefix for stored objects, string, optional. If none set, the prefix as in repository tree will be used.
 * ``region`` - bucket region (e.g. ``eu-central-1``), string, required.
 * ``secret_key`` - AWS secret access key, string, required.

docs/faq.rst

@@ -1,4 +1,3 @@
-
 FAQ
 ===
 
@@ -18,8 +17,8 @@ TL;DR
 .. code-block:: shell
 
    yay -S ahriman
-   ahriman -a x86_64 service-setup --packager "ahriman bot <ahriman@example.com>" --repository "repository"
-   systemctl enable --now ahriman@x86_64.timer
+   ahriman -a x86_64 -r aur-clone service-setup --packager "ahriman bot <ahriman@example.com>"
+   systemctl enable --now ahriman@x86_64-aur-clone.timer
 
 Long answer
 """""""""""
@@ -33,7 +32,7 @@ There is special command which can be used in order to validate current configur
 
 .. code-block:: shell
 
-   ahriman -a x86_64 service-config-validate --exit-code
+   ahriman service-config-validate --exit-code
 
 This command will print found errors, based on `cerberus <https://docs.python-cerberus.org/>`_, e.g.:
 
@@ -72,7 +71,7 @@ states that default build command is ``extra-x86_64-build``. But if there is sec
    [build:i686]
    build_command = extra-i686-build
 
-the ``extra-i686-build`` command will be used for ``i686`` architecture.
+the ``extra-i686-build`` command will be used for ``i686`` architecture. You can also override settings for different repositories and architectures; in this case section names will be ``build:aur-clone`` (repository name only) and ``build:aur-clone:i686`` (both repository name and architecture).
 
 How to generate build reports
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -122,7 +121,7 @@ How do I add new package
 
    sudo -u ahriman ahriman package-add ahriman --now
 
-``--now`` flag is totally optional and just run ``repo-update`` subcommand after the registering the new package, Thus the extended flow is the following:
+``--now`` flag is totally optional and just run ``repo-update`` subcommand after the registering the new package. Thus the extended flow is the following:
 
 .. code-block:: shell
 
@@ -197,7 +196,7 @@ Alternatively you can create full-diff patches, which are calculated by using ``
 
    .. code-block:: shell
 
-   sudo -u ahriman ahriman patch-set-add /path/to/local/directory/with/PKGBUILD
+      sudo -u ahriman ahriman patch-set-add /path/to/local/directory/with/PKGBUILD
 
 The last command will calculate diff from current tree to the ``HEAD`` and will store it locally. Patches will be applied on any package actions (e.g. it can be used for dependency management).
 
@@ -210,7 +209,7 @@ So it is the same as adding any other package, but due to restrictions you must
 
    sudo -u ahriman ahriman package-add pacman -s repository
 
-This feature is heavily depends on local pacman cache. In order to use this feature it is recommended to either run ``pacman -Sy`` before the interaction or configure timer for this.
+This feature is heavily depends on local pacman cache. In order to use this feature it is recommended to either run ``pacman -Sy`` before the interaction or use internal application cache with ``--refresh`` flag.
 
 Package build fails because it cannot validate PGP signature of source files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -306,7 +305,7 @@ TL;DR
 
    sudo -u ahriman ahriman repo-rebuild --depends-on python
 
-You can even rebuild the whole repository (which is particular useful in case if you would like to change packager) if you do not supply ``--depends-on`` option.
+You can even rebuild the whole repository (which is particular useful in case if you would like to change packager) if you do not supply ``--depends-on`` option. This action will automatically increment ``pkgrel`` value; in case if you don't want to, the ``--no-increment`` option has to be supplied.
 
 However, note that you do not need to rebuild repository in case if you just changed signing option, just use ``repo-sign`` command instead. 
 
@@ -318,7 +317,7 @@ Add the following lines to your ``pacman.conf``:
 .. code-block:: ini
 
    [repository]
-   Server = file:///var/lib/ahriman/repository/x86_64
+   Server = file:///var/lib/ahriman/repository/$repo/$arch
 
 (You might need to add ``SigLevel`` option according to the pacman documentation.)
 
@@ -360,7 +359,14 @@ Example of the status page configuration is the following (status service is usi
 Docker image
 ------------
 
-We provide official images which can be found under ``arcan1s/ahriman`` repository. Docker image is being updated on each commit to master as well as on each version. If you would like to use last (probably unstable) build you can use ``edge`` tag or ``latest`` for any tagged versions; otherwise you can use any version tag available.
+We provide official images which can be found under:
+
+* docker registry ``arcan1s/ahriman``;
+* ghcr.io registry ``ghcr.io/arcan1s/ahriman``;
+
+These images are totally identical.
+
+Docker image is being updated on each commit to master as well as on each version. If you would like to use last (probably unstable) build you can use ``edge`` tag or ``latest`` for any tagged versions; otherwise you can use any version tag available.
 
 The default action (in case if no arguments provided) is ``repo-update``. Basically the idea is to run container, e.g.:
 
@@ -392,11 +398,14 @@ The following environment variables are supported:
 * ``AHRIMAN_FORCE_ROOT`` - force run ahriman as root instead of guessing by subcommand.
 * ``AHRIMAN_HOST`` - host for the web interface, default is ``0.0.0.0``.
 * ``AHRIMAN_MULTILIB`` - if set (default) multilib repository will be used, disabled otherwise.
-* ``AHRIMAN_OUTPUT`` - controls logging handler, e.g. ``syslog``, ``console``. The name must be found in logging configuration. Note that if ``syslog`` (the default) handler is used you will need to mount ``/dev/log`` inside container because it is not available there.
+* ``AHRIMAN_OUTPUT`` - controls logging handler, e.g. ``syslog``, ``console``. The name must be found in logging configuration. Note that if ``syslog`` handler is used you will need to mount ``/dev/log`` inside container because it is not available there.
 * ``AHRIMAN_PACKAGER`` - packager name from which packages will be built, default is ``ahriman bot <ahriman@example.com>``.
 * ``AHRIMAN_PACMAN_MIRROR`` - override pacman mirror server if set.
 * ``AHRIMAN_PORT`` - HTTP server port if any, default is empty.
+* ``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_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``.
@@ -422,7 +431,7 @@ This command uses same rules as ``repo-update``, thus, e.g. requires ``--privile
 Web service setup
 ^^^^^^^^^^^^^^^^^
 
-Well for that you would need to have web container instance running forever; it can be achieved by the following command:
+For that you would need to have web container instance running forever; it can be achieved by the following command:
 
 .. code-block:: shell
 
@@ -444,6 +453,20 @@ Otherwise, you would need to pass ``AHRIMAN_PORT`` and mount container network t
 
    docker run --privileged --net=host -e AHRIMAN_PORT=8080 -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
+Mutli-repository web service
+""""""""""""""""""""""""""""
+
+Idea is pretty same as to just run web service. However, it is required to run setup commands for each repository, except for one which is specified by ``AHRIMAN_REPOSITORY`` and ``AHRIMAN_ARCHITECTURE ` variables.
+
+In order to create configuration for additional repositories, the ``AHRIMAN_POSTSETUP_COMMAND`` variable should be used, e.g.:
+
+.. code-block:: shell
+
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -e AHRIMAN_POSTSETUP_COMMAND="ahriman --architecture x86_64 --repository aur-clone-v2 service-setup --build-as-user ahriman --packager 'ahriman bot <ahriman@example.com>'" -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+
+The command above will also create configuration for the repository named ``aur-clone-v2``.
+
+Note, however, that the command above is only required in case if the service is going to be used to run subprocesses. Otherwise, everything else (web interface, status, etc) will be handled as usual.
 
 Non-x86_64 architecture setup
 -----------------------------
@@ -456,22 +479,22 @@ Physical server setup
 In this example we are going to use files and packages which are provided by official repositories of the used architecture. Note, that versions might be different, thus you need to find correct versions on the distribution web site, e.g. `archlinux32 packages <https://www.archlinux32.org/packages/>`_.
 
 #.
-   First, considering having base Arch Linux system, we need to install keyring for the specified repositories:
+   First, considering having base Arch Linux system, we need to install keyring for the specified repositories, e.g.:
 
    .. code-block:: shell
 
-      wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
-      pacman -U archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+      wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20230705-1.0-any.pkg.tar.zst
+      pacman -U archlinux32-keyring-20230705-1.0-any.pkg.tar.zst
 
 #.
-   In order to run ``devtools`` scripts for custom architecture they also need specific ``makepkg`` configuration, it can be retrieved by installing the ``devtools`` package of the distribution:
+   In order to run ``devtools`` scripts for custom architecture they also need specific ``makepkg`` configuration, it can be retrieved by installing the ``devtools`` package of the distribution, e.g.:
 
    .. code-block:: shell
 
-      wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.0-any.pkg.tar.zst
-      pacman -U devtools-20221208-1.0-any.pkg.tar.zst
+      wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.2-any.pkg.tar.zst
+      pacman -U devtools-20221208-1.2-any.pkg.tar.zst
 
-   Alternatively, you can create your own ``makepkg`` configuration and save it as ``/usr/share/devtools/makepkg-i686.conf``.
+   Alternatively, you can create your own ``makepkg`` configuration and save it as ``/usr/share/devtools/makepkg.conf.d/i686.conf``.
 
 #.
    Setup repository as usual:
@@ -485,6 +508,9 @@ In this example we are going to use files and packages which are provided by off
    * ``--mirror`` - link to the mirrors which will be used instead of official repositories.
    * ``--no-multilib`` - in the example we are using i686 architecture for which multilib repository doesn't exist.
 
+#.
+   That's all Folks!
+
 Docker container setup
 ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -510,8 +536,8 @@ There are two possible ways to achieve same setup, by using docker container. Th
    .. code-block:: dockerfile
 
       RUN pacman --noconfirm -Sy wget
-      RUN wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.0-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.0-any.pkg.tar.zst
-      RUN wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20220927-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+      RUN wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.2-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.2-any.pkg.tar.zst
+      RUN wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20230705-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20230705-1.0-any.pkg.tar.zst
 
 #.
    At that point you should have full ``Dockerfile`` like:
@@ -523,8 +549,8 @@ There are two possible ways to achieve same setup, by using docker container. Th
       RUN pacman-key --init
 
       RUN pacman --noconfirm -Sy wget
-      RUN wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.0-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.0-any.pkg.tar.zst
-      RUN wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20220927-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+      RUN wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.2-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.2-any.pkg.tar.zst
+      RUN wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20230705-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20230705-1.0-any.pkg.tar.zst
 
 #.
    After that you can build you own container, e.g.:
@@ -554,8 +580,8 @@ There are several choices:
    .. code-block::
 
        server {
-           location /x86_64 {
-               root /var/lib/ahriman/repository/x86_64;
+           location / {
+               root /var/lib/ahriman/repository/;
                autoindex on;
            }
        }
@@ -571,7 +597,7 @@ There are several choices:
        [rsync]
        remote = 192.168.0.1:/srv/repo
 
-   After that just add ``/srv/repo`` to the ``pacman.conf`` as usual. You can also upload to S3 (e.g. ``Server = https://s3.eu-central-1.amazonaws.com/repository/x86_64``) or to Github (e.g. ``Server = https://github.com/ahriman/repository/releases/download/x86_64``).
+   After that just add ``/srv/repo`` to the ``pacman.conf`` as usual. You can also upload to S3 (``Server = https://s3.eu-central-1.amazonaws.com/repository/aur-clone/x86_64``) or to Github (``Server = https://github.com/ahriman/repository/releases/download/aur-clone-x86_64``).
 
 How to sync to S3
 ^^^^^^^^^^^^^^^^^
@@ -632,6 +658,23 @@ How to sync to S3
        region = eu-central-1
        secret_key = ...
 
+S3 with SSL
+"""""""""""
+
+In order to configure S3 on custom domain with SSL (and some other features, like redirects), the CloudFront should be used.
+
+#. Configure S3 as described above.
+#. In bucket properties, enable static website hosting with hosting type "Host a static website".
+#. Go to AWS Certificate Manager and create public ceritificate on your domain. Validate domain as suggested.
+#. Go to CloudFront and create distribution. The following settings are required:
+
+   * Origin domain choose S3 bucket.
+   * Tick use website endpoint.
+   * Disable caching.
+   * Select issued certificate.
+
+#. Point DNS record to CloudFront address.
+
 How to sync to Github releases
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -664,7 +707,7 @@ How to report by email
 
    .. code-block:: shell
 
-      yay -S python-jinja
+      yay -S --asdeps python-jinja
 
 #. 
    Configure the service:
@@ -676,7 +719,7 @@ How to report by email
 
       [email]
       host = smtp.example.com
-      link_path = http://example.com/x86_64
+      link_path = http://example.com/aur-clone/x86_64
       password = ...
       port = 465
       receivers = me@example.com
@@ -691,7 +734,7 @@ How to generate index page for S3
 
    .. code-block:: shell
 
-      yay -S python-jinja
+      yay -S --asdeps python-jinja
 
 #. 
    Configure the service:
@@ -702,10 +745,10 @@ How to generate index page for S3
       target = html
 
       [html]
-      path = /var/lib/ahriman/repository/x86_64/index.html
-      link_path = http://example.com/x86_64
+      path = /var/lib/ahriman/repository/aur-clone/x86_64/index.html
+      link_path = http://example.com/aur-clone/x86_64
 
-After these steps ``index.html`` file will be automatically synced to S3
+After these steps ``index.html`` file will be automatically synced to S3.
 
 How to post build report to telegram
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -715,7 +758,7 @@ How to post build report to telegram
 
    .. code-block:: shell
 
-      yay -S python-jinja
+      yay -S --asdeps python-jinja
 
 #. 
    Register bot in telegram. You can do it by talking with `@BotFather <https://t.me/botfather>`_. For more details please refer to `official documentation <https://core.telegram.org/bots>`_.
@@ -723,7 +766,6 @@ How to post build report to telegram
 #. 
    Optionally (if you want to post message in chat):
 
-
    #. Create telegram channel.
    #. Invite your bot into the channel.
    #. Make your channel public
@@ -742,7 +784,7 @@ How to post build report to telegram
       [telegram]
       api_key = aaAAbbBBccCC
       chat_id = @ahriman
-      link_path = http://example.com/x86_64
+      link_path = http://example.com/aur-clone/x86_64
 
    ``api_key`` is the one sent by `@BotFather <https://t.me/botfather>`_, ``chat_id`` is the value retrieved from previous step.
 
@@ -754,6 +796,277 @@ If you did everything fine you should receive the message with the next update.
 
 (replace ``${CHAT_ID}`` and ``${API_KEY}`` with the values from configuration).
 
+Distributed builds
+------------------
+
+The service allows to run build on multiple machines and collect packages on main node. There are several ways to achieve it, this section describes officially supported methods.
+
+Remote synchronization and remote server call
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This setup requires at least two instances of the service:
+
+#. Web service (with opt-in authorization enabled), later will be referenced as ``master`` node.
+#. Application instances responsible for build, later will be referenced as ``worker`` nodes.
+
+In this example the following settings are assumed:
+
+* Repository architecture is ``x86_64``.
+* Master node address is ``master.example.com``.
+
+Master node configuration
+"""""""""""""""""""""""""
+
+The only requirements for the master node is that API must be available for worker nodes to call (e.g. port must be exposed to internet, or local network in case of VPN, etc) and file upload must be enabled:
+
+.. code-block:: ini
+
+   [web]
+   enable_archive_upload = yes
+
+In addition, the following settings are recommended for the master node:
+
+*
+  As it has been mentioned above, it is recommended to enable authentication (see `How to enable basic authorization`_) and create system user which will be used later. Later this user (if any) will be referenced as ``worker-user``.
+
+*
+  In order to be able to spawn multiple processes at the same time, wait timeout must be configured:
+
+  .. code-block:: ini
+
+     [web]
+     wait_timeout = 0
+
+Worker nodes configuration
+""""""""""""""""""""""""""
+
+#.
+   First of all, in this setup you need to split your repository into chunks manually, e.g. if you have repository on master node with packages ``A``, ``B`` and ``C``, you need to split them between all available workers, as example:
+
+   * Worker #1: ``A``.
+   * Worker #2: ``B`` and ``C``.
+
+#.
+   Each worker must be configured to upload files to master node:
+
+   .. code-block:: ini
+
+      [upload]
+      target = remote-service
+
+      [remote-service]
+
+#.
+   Worker must be configured to access web on master node:
+
+   .. code-block:: ini
+
+      [web]
+      address = master.example.com
+      username = worker-user
+      password = very-secure-password
+
+   As it has been mentioned above, ``web.address`` must be available for workers. In case if unix socket is used, it can be passed as ``web.unix_socket`` variable as usual. Optional ``web.username``/``web.password`` can be supplied in case if authentication was enabled on master node.
+
+#.
+   Each worker must call master node on success:
+
+   .. code-block:: ini
+
+      [report]
+      target = remote-call
+
+      [remote-call]
+      manual = yes
+
+   After success synchronization (see above), the built packages will be put into directory, from which they will be read during manual update, thus ``remote-call.manual`` flag is required.
+
+#.
+   Change order of trigger runs. This step is required, because by default the report trigger is called before the upload trigger and we would like to achieve the opposite:
+
+   .. code-block:: ini
+
+      [build]
+      triggers = ahriman.core.gitremote.RemotePullTrigger ahriman.core.upload.UploadTrigger ahriman.core.report.ReportTrigger ahriman.core.gitremote.RemotePushTrigger
+
+In addition, the following settings are recommended for workers:
+
+*
+  You might want to wait until report trigger will be completed; in this case the following option must be set:
+
+  .. code-block:: ini
+
+     [remote-call]
+     wait_timeout = 0
+
+Dependency management
+"""""""""""""""""""""
+
+By default worker nodes don't know anything about master nodes packages, thus it will try to build each dependency by its own. However, using ``AHRIMAN_REPOSITORY_SERVER`` docker variable (or ``--server`` flag for setup command), it is possible to specify address of the master node for devtools configuration.
+
+Repository and packages signing
+"""""""""""""""""""""""""""""""
+
+You can sign packages on worker nodes and then signatures will be synced to master node. In order to do so, you need to configure worker node as following, e.g.:
+
+.. code-block:: ini
+
+   [sign]
+   target = package
+   key = 8BE91E5A773FB48AC05CC1EDBED105AED6246B39
+
+Note, however, that in this case, signatures will not be validated on master node and just will be copied to repository tree.
+
+If you would like to sign only database files (aka repository sign), it has to be configured on master node only as usual, e.g.:
+
+.. code-block:: ini
+
+   [sign]
+   target = repository
+   key = 8BE91E5A773FB48AC05CC1EDBED105AED6246B39
+
+Double node minimal docker example
+""""""""""""""""""""""""""""""""""
+
+Master node config (``master.ini``) as:
+
+.. code-block:: ini
+
+   [auth]
+   target = mapping
+
+   [web]
+   enable_archive_upload = yes
+   wait_timeout = 0
+
+
+Command to run master node:
+
+.. code-block:: shell
+
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -v master.ini:/etc/ahriman.ini.d/overrides.ini arcan1s/ahriman:latest web
+
+The user ``worker-user`` has been created additionally. Worker node config (``worker.ini``) as:
+
+.. code-block:: ini
+
+   [web]
+   address = http://172.17.0.1:8080
+   username = worker-user
+   password = very-secure-password
+
+   [upload]
+   target = remote-service
+
+   [remote-service]
+
+   [report]
+   target = remote-call
+
+   [remote-call]
+   manual = yes
+   wait_timeout = 0
+
+   [build]
+   triggers = ahriman.core.gitremote.RemotePullTrigger ahriman.core.upload.UploadTrigger ahriman.core.report.ReportTrigger ahriman.core.gitremote.RemotePushTrigger
+
+The address above (``http://172.17.0.1:8080``) is something available for worker container.
+
+Command to run worker node:
+
+.. code-block:: shell
+
+   docker run --privileged -v worker.ini:/etc/ahriman.ini.d/overrides.ini -it arcan1s/ahriman:latest package-add ahriman --now
+
+The command above will successfully build ``ahriman`` package, upload it on master node and, finally, will update master node repository.
+
+Addition of new package and repository update
+"""""""""""""""""""""""""""""""""""""""""""""
+
+Just run on worker command as usual, the built packages will be automatically uploaded to master node. Note that automatic update process must be disabled on master node.
+
+Package removal
+"""""""""""""""
+
+This action must be done in two steps:
+
+#. Remove package on worker.
+#. Remove package on master node.
+
+Maintenance packages
+--------------------
+
+Generate keyring package
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+The application provides special plugin which generates keyring package. This plugin heavily depends on ``sign`` group settings, however it is possible to override them. The minimal package can be generated in the following way:
+
+#.
+   Edit configuration:
+
+   .. code-block:: ini
+
+      [keyring]
+      target = keyring-generator
+
+   By default it will use ``sign.key`` as trusted key and all other keys as packagers ones. For all available options refer to :doc:`configuration <configuration>`.
+
+#.
+   Create package source files:
+
+   .. code-block:: shell
+
+      sudo -u ahriman ahriman repo-create-keyring
+
+   This command will generate PKGBUILD, revoked and trusted listings and keyring itself and will register the package in database.
+
+#.
+   Build new package as usual:
+
+   .. code-block:: shell
+
+      sudo -u ahriman ahriman package-add aur-clone-keyring --source local --now
+
+   where ``aur-clone`` is your repository name.
+
+This plugin might have some issues, in case of any of them, kindly create `new issue <https://github.com/arcan1s/ahriman/issues/new/choose>`_.
+
+Generate mirrorlist package
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The application provides special plugin which generates mirrorlist package also. It is possible to distribute this package as usual later. The package can be generated in the following way:
+
+#.
+   Edit configuration:
+
+   .. code-block:: ini
+
+      [mirrorlist]
+      target = mirrorlist-generator
+
+      [mirrorlist-generator]
+      servers = https://repo.example.com/$arch
+
+   The ``mirrorlist-generator.servers`` must contain list of available mirrors, the ``$arch`` and ``$repo`` variables are supported. For more options kindly refer to :doc:`configuration <configuration>`.
+
+#.
+   Create package source files:
+
+   .. code-block:: shell
+
+      sudo -u ahriman ahriman repo-create-mirrorlist
+
+   This command will generate PKGBUILD and mirrorlist file and will register the package in database.
+
+#.
+   Build new package as usual:
+
+   .. code-block:: shell
+
+      sudo -u ahriman ahriman package-add aur-clone-mirrorlist --source local --now
+
+   where ``aur-clone`` is your repository name.
+
 Web service
 -----------
 
@@ -765,7 +1078,7 @@ How to setup web service
 
    .. code-block:: shell
 
-      yay -S python-aiohttp python-aiohttp-jinja2
+      yay -S --asdeps python-aiohttp python-aiohttp-jinja2 python-aiohttp-apispec>=3.0.0 python-aiohttp-cors
 
 #. 
    Configure service:
@@ -776,7 +1089,7 @@ How to setup web service
       port = 8080
 
 #. 
-   Start the web service ``systemctl enable --now ahriman-web@x86_64``.
+   Start the web service ``systemctl enable --now ahriman-web``.
 
 How to enable basic authorization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -786,15 +1099,18 @@ How to enable basic authorization
 
    .. code-block:: shell
 
-      yay -S python-aiohttp-security python-aiohttp-session python-cryptography
+      yay -S --asdeps python-aiohttp-security python-aiohttp-session python-cryptography
 
 #. 
-   Configure the service to enable authorization:
+   Configure the service to enable authorization (``salt`` can be generated as any random string and optional):
 
    .. code-block:: ini
 
       [auth]
       target = configuration
+      salt = somerandomstring
+
+   The ``salt`` parameter is optional, but recommended.
 
 #.
    In order to provide access for reporting from application instances you can (recommended way) use unix sockets by configuring the following (note, that it requires ``python-requests-unixsocket`` package to be installed):
@@ -814,7 +1130,7 @@ How to enable basic authorization
 
       sudo -u ahriman ahriman user-add -r full api
 
-   This command will ask for the password, just type it in stdin; *do not* leave the field blank, user will not be able to authorize, and finally configure the application:
+   This command will ask for the password, just type it in stdin; **do not** leave the field blank, user will not be able to authorize, and finally configure the application:
 
    .. code-block:: ini
 
@@ -830,7 +1146,7 @@ How to enable basic authorization
       sudo -u ahriman ahriman user-add -r full my-first-user
 
 #.
-   Restart web service ``systemctl restart ahriman-web@x86_64``.
+   Restart web service ``systemctl restart ahriman-web``.
 
 How to enable OAuth authorization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -842,7 +1158,7 @@ How to enable OAuth authorization
 
    .. code-block:: shell
 
-      yay -S python-aiohttp-security python-aiohttp-session python-cryptography python-aioauth-client
+      yay -S --asdeps python-aiohttp-security python-aiohttp-session python-cryptography python-aioauth-client
 
 #. 
    Configure the service:
@@ -860,7 +1176,7 @@ How to enable OAuth authorization
    Configure ``oauth_provider`` and ``oauth_scopes`` in case if you would like to use different from Google provider. Scope must grant access to user email. ``web.address`` is required to make callback URL available from internet.
 
 #. 
-   Create service user:
+   If you are not going to use unix socket, you also need to create service user (remember to set ``auth.salt`` option before if required):
 
    .. code-block:: shell
 
@@ -876,7 +1192,7 @@ How to enable OAuth authorization
    When it will ask for the password leave it blank.
 
 #.
-   Restart web service ``systemctl restart ahriman-web@x86_64``.
+   Restart web service ``systemctl restart ahriman-web``.
 
 How to implement own interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -954,6 +1270,11 @@ Don't know, haven't tried it. But it lacks of documentation at least.
 * ``repoctl`` is able to store old packages.
 * Ability to host repository from same command in ``repoctl`` vs external services (e.g. nginx) in ``ahriman``.
 
+`repod <https://gitlab.archlinux.org/archlinux/repod>`_
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+Official tool provided by distribution, has clean logic, but it is just a helper for ``repo-add``, e.g. it doesn't work with AUR and all packages builds have to be handled separately.
+
 `repo-scripts <https://github.com/arcan1s/repo-scripts>`_
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
@@ -975,20 +1296,40 @@ It is automation tools for ``repoctl`` mentioned above. Except for using shell i
 How to check service logs
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-By default, the service writes logs to ``/dev/log`` which can be accessed by using ``journalctl`` command (logs are written to the journal of the user under which command is run).
-
-You can also edit configuration and forward logs to ``stderr``, just change ``handlers`` value, e.g.:
+By default, the service writes logs to ``journald`` which can be accessed by using ``journalctl`` command (logs are written to the journal of the user under which command is run). In order to retrieve logs for the process you can use the following command:
 
 .. code-block:: shell
 
-   sed -i 's/handlers = syslog_handler/handlers = console_handler/g' /etc/ahriman.ini.d/logging.ini
+   sudo journalctl SYSLOG_IDENTIFIER=ahriman
 
-You can even configure logging as you wish, but kindly refer to python ``logging`` module `configuration <https://docs.python.org/3/library/logging.config.html>`_. The application uses java concept to log messages, e.g. class ``Application`` imported from ``ahriman.application.application`` package will have logger called ``ahriman.application.application.Application``. In order to e.g. change logger name for whole application package it is possible to change values for ``ahriman.application`` package; thus editing ``ahriman`` logger configuration will change logging for whole application (unless there are overrides for another logger).
+You can also ask to forward logs to ``stderr``, just set ``--log-handler`` flag, e.g.:
+
+.. code-block:: shell
+
+   ahriman --log-handler console ...
+
+You can even configure logging as you wish, but kindly refer to python ``logging`` module `configuration <https://docs.python.org/3/library/logging.config.html>`_.
+
+The application uses java concept to log messages, e.g. class ``Application`` imported from ``ahriman.application.application`` package will have logger called ``ahriman.application.application.Application``. In order to e.g. change logger name for whole application package it is possible to change values for ``ahriman.application`` package; thus editing ``ahriman`` logger configuration will change logging for whole application (unless there are overrides for another logger).
 
 Html customization
 ^^^^^^^^^^^^^^^^^^
 
-It is possible to customize html templates. In order to do so, create files somewhere (refer to Jinja2 documentation and the service source code for available parameters) and put ``template_path`` to configuration pointing to this directory.
+It is possible to customize html templates. In order to do so, create files somewhere (refer to Jinja2 documentation and the service source code for available parameters) and prepend ``templates`` with value pointing to this directory.
+
+In addition, default html templates supports style customization out-of-box. In order to customize style, just put file named ``user-style.jinja2`` to the templates directory.
+
+Web API extension
+^^^^^^^^^^^^^^^^^
+
+The application loads web views dynamically, so it is possible relatively easy extend its API. In order to do so:
+
+#. Create view class which is derived from ``ahriman.web.views.base.BaseView`` class.
+#. Create implementation for this class.
+#. Put file into ``ahriman.web.views`` package.
+#. Restart application.
+
+For more details about implementation and possibilities, kindly refer to module documentation and source code and `aiohttp documentation <https://docs.aiohttp.org/en/stable/>`_.
 
 I did not find my question
 ^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/index.rst

@@ -12,7 +12,8 @@ Features
 * VCS packages support.
 * Official repository support.
 * Ability to patch AUR packages and even create package from local PKGBUILDs.
-* Sign support with gpg (repository, package, per package settings).
+* Various rebuild options with ability to automatically bump package version.
+* Sign support with gpg (repository, package), multiple packagers support.
 * Triggers for repository updates, e.g. synchronization to remote services (rsync, s3 and github) and report generation (email, html, telegram).
 * Repository status interface with optional authorization and control options.
 
@@ -33,6 +34,7 @@ Contents
    configuration
    command-line
    faq
+   migration
    architecture
    advanced-usage
    triggers

docs/migration.rst

@@ -0,0 +1,68 @@
+Manual migrations
+=================
+
+Normally most of migrations are handled automatically after application start. However, some upgrades require manual interventions; this document describes them.
+
+Upgrades to breakpoints
+-----------------------
+
+To 2.9.0
+^^^^^^^^
+
+This release includes major upgrade for the newest devtools and archlinux repository structure. In order to upgrade package need to:
+
+#. Upgrade to the latest major release of python (3.11) (required by other changes).
+#. Upgrade devtools to the latest release.
+#. Backup your settings, ``/etc/ahriman.ini.d/00-setup-overrides.ini`` by default.
+#. Run setup command (i.e. ``ahriman service-setup``) again with the same arguments as you used before. This step can be done manually by moving ``devtools`` configuration (something like ``/usr/share/devtools/pacman-ahriman*.conf``) to new location ``/usr/share/devtools/pacman.conf.d/`` under name ``ahriman.conf``. After that make sure to remove any ``community`` mentions from configurations (e.g. ``/usr/share/devtools/pacman.conf.d/ahriman.conf``, ``/etc/ahriman.ini``) if there were any. The only thing which will change is ``devtools`` configuration.
+#. Remove build chroot as it is incompatible, e.g. ``sudo ahriman service-clean --chroot``.
+#. Run ``sudo -u ahriman ahriman update --no-aur --no-local --no-manual -yy`` in order to update local databases.
+
+To 2.12.0
+^^^^^^^^^
+
+This release includes paths migration. Unlike usual case, no automatic migration is performed because it might break user configuration. The following noticeable changes have been made:
+
+* Path to pre-built packages now includes repository name, i.e. it has been changed from ``/var/lib/ahriman/packages/x86_64`` to ``/var/lib/ahriman/packages/aur-clone/x86_64``.
+* Path to pacman databases now includes repository name too, it has been changed from ``/var/lib/ahriman/pacman/x86_64`` to ``/var/lib/ahriman/pacman/aur-clone/x86_64``.
+* Path to repository itself also includes repository name, from ``/var/lib/ahriman/repository/x86_64`` to ``/var/lib/ahriman/repository/aur-clone/x86_64``.
+
+In order to migrate to new filesystem tree the following actions are required:
+
+#.
+   Stop and disable all services, e.g. timer and web service:
+
+   .. code-block:: shell
+
+      sudo systemctl disable --now ahriman@x86_64.timer
+      sudo systemctl disable --now ahriman-web@x86_64
+
+#.
+   Create directory tree. It can be done by running ``ahriman service-tree-migrate`` subcommand. It performs copying between the old repository tree and the new one. Alternatively you can copy directories by hands.
+
+#.
+   Edit configuration in case if anything is pointing to the old path, e.g. HTML report generation, in the way in which it will be pointed to directory inside repository specific one, e.g. ``/var/lib/ahriman/repository/x86_64`` to ``/var/lib/ahriman/repository/aur-clone/x86_64``.
+
+#.
+   Edit devtools pacman configuration (``/usr/share/devtools/pacman.conf.d/ahriman-x86_64.conf`` by default) replacing ``Server`` with path to your repository, e.g.:
+
+   .. code-block:: ini
+
+      [aur-clone]
+      SigLevel = Optional TrustAll
+      Server = file:///var/lib/ahriman/repository/aur-clone/x86_64
+
+   Alternatively it can be done by running ``service-setup`` command again.
+
+#. If you didn't run setup command on the previous step, make sure to remove architecture reference from ``web`` section (if any).
+
+#.
+   Make sure to update remote synchronization services if any. Almost all of them rely on current repository tree by default, so you need to setup either redirects or configure to synchronize to the old locations (e.g. ``object_path`` option for S3 synchronization).
+
+#.
+   Enable and start services again. Unit template parameter should include both repository architecture and name, dash separated, e.g. ``x86_64-aur-clone``:
+
+   .. code-block:: shell
+
+      sudo systemctl enable --now ahriman@x86_64-aur-clone.timer
+      sudo systemctl enable --now ahriman-web

docs/setup.rst

@@ -10,7 +10,7 @@ Initial setup
 
    .. code-block:: shell
 
-      sudo ahriman -a x86_64 service-setup ...
+      sudo ahriman -a x86_64 -r aur-clone service-setup ...
 
    ``service-setup`` literally does the following steps:
 
@@ -29,26 +29,26 @@ Initial setup
 
          .. code-block:: shell
 
-            ln -s /usr/bin/archbuild /usr/local/bin/ahriman-x86_64-build
+            ln -s /usr/bin/archbuild /usr/local/bin/aur-clone-x86_64-build
 
       #. 
-         Create configuration file (same as previous ``pacman-{name}.conf``):
+         Create configuration file (same as previous ``{name}.conf``):
 
          .. code-block:: shell
 
-            cp /usr/share/devtools/pacman-{extra,ahriman}.conf
+            cp /usr/share/devtools/pacman.conf.d/{extra,aur-clone}.conf
 
       #. 
          Change configuration file, add your own repository, add multilib repository etc:
 
          .. code-block:: shell
 
-            echo '[multilib]' | tee -a /usr/share/devtools/pacman-ahriman.conf
-            echo 'Include = /etc/pacman.d/mirrorlist' | tee -a /usr/share/devtools/pacman-ahriman.conf
+            echo '[multilib]' | tee -a /usr/share/devtools/pacman.conf.d/aur-clone-x86_64.conf
+            echo 'Include = /etc/pacman.d/mirrorlist' | tee -a /usr/share/devtools/pacman.conf.d/aur-clone-x86_64.conf
 
-            echo '[aur-clone]' | tee -a /usr/share/devtools/pacman-ahriman.conf
-            echo 'SigLevel = Optional TrustAll' | tee -a /usr/share/devtools/pacman-ahriman.conf
-            echo 'Server = file:///var/lib/ahriman/repository/$arch' | tee -a /usr/share/devtools/pacman-ahriman.conf
+            echo '[aur-clone]' | tee -a /usr/share/devtools/pacman.conf.d/aur-clone-x86_64.conf
+            echo 'SigLevel = Optional TrustAll' | tee -a /usr/share/devtools/pacman.conf.d/aur-clone-x86_64.conf
+            echo 'Server = file:///var/lib/ahriman/repository/$repo/$arch' | tee -a /usr/share/devtools/pacman.conf.d/aur-clone-x86_64.conf
 
       #. 
          Set ``build_command`` option to point to your command:
@@ -56,15 +56,15 @@ Initial setup
          .. code-block:: shell
 
             echo '[build]' | tee -a /etc/ahriman.ini.d/build.ini
-            echo 'build_command = ahriman-x86_64-build' | tee -a /etc/ahriman.ini.d/build.ini
+            echo 'build_command = aur-clone-x86_64-build' | tee -a /etc/ahriman.ini.d/build.ini
 
       #.
          Configure ``/etc/sudoers.d/ahriman`` to allow running command without a password:
 
          .. code-block:: shell
 
-            echo 'Cmnd_Alias CARCHBUILD_CMD = /usr/local/bin/ahriman-x86_64-build *' | tee -a /etc/sudoers.d/ahriman
-            echo 'ahriman ALL=(ALL) NOPASSWD: CARCHBUILD_CMD' | tee -a /etc/sudoers.d/ahriman
+            echo 'Cmnd_Alias CARCHBUILD_CMD = /usr/local/bin/aur-clone-x86_64-build *' | tee -a /etc/sudoers.d/ahriman
+            echo 'ahriman ALL=(ALL) NOPASSWD:SETENV: CARCHBUILD_CMD' | tee -a /etc/sudoers.d/ahriman
             chmod 400 /etc/sudoers.d/ahriman
 
       This command supports several arguments, kindly refer to its help message.
@@ -74,20 +74,20 @@ Initial setup
 
    .. code-block:: shell
 
-       systemctl enable --now ahriman@x86_64.timer
+       systemctl enable --now ahriman@x86_64-aur-clone.timer
 
 #. 
    Start and enable status page:
 
    .. code-block:: shell
 
-       systemctl enable --now ahriman-web@x86_64
+       systemctl enable --now ahriman-web
 
 #. 
    Add packages by using ``ahriman package-add {package}`` command:
 
    .. code-block:: shell
 
-       sudo -u ahriman ahriman -a x86_64 package-add ahriman --now --refresh
+       sudo -u ahriman ahriman package-add ahriman --now --refresh
 
    The ``--refresh`` flag is required in order to handle local database update.

docs/triggers.rst

@@ -31,6 +31,16 @@ This trigger will be called right after build process (``on_result``). It will p
 
 Trigger which can be used for reporting. It implements ``on_result`` method and thus being called on each build update and generates report (e.g. html, telegram etc) according to the current settings.
 
+``ahriman.core.support.KeyringTrigger``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Generator for keyring package. This trigger will extract keys from local keychain and pack them into keyring specific format. This trigger will generate sources including PKGBUILD, which can be used later for package building.
+
+``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.
+
 ``ahriman.core.upload.UploadTrigger``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -73,7 +83,7 @@ The ``context`` also implements collection methods such as ``__iter__`` and ``__
 Trigger example
 ---------------
 
-Lets consider example of reporting trigger (e.g. `slack <https://slack.com/>`_, which provides easy HTTP API for integration triggers).gre
+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``).
 
@@ -85,8 +95,8 @@ As it has been mentioned, our trigger must derive from specific class:
 
    class SlackReporter(Trigger):
 
-       def __init__(self, architecture, configuration):
-           Trigger.__init__(self, architecture, configuration)
+       def __init__(self, repository_id, configuration):
+           Trigger.__init__(self, repository_id, configuration)
            self.slack_url = configuration.get("slack", "url")
            self.channel = configuration.get("slack", "channel")
            self.username = configuration.get("slack", "username")
@@ -110,8 +120,8 @@ Obviously you can implement the specified method in class, but for guide purpose
 
    class SlackReporter(Trigger):
 
-       def __init__(self, architecture, configuration):
-           Trigger.__init__(self, architecture, configuration)
+       def __init__(self, repository_id, configuration):
+           Trigger.__init__(self, repository_id, configuration)
            self.slack_url = configuration.get("slack", "url")
            self.channel = configuration.get("slack", "channel")
            self.username = configuration.get("slack", "username")
@@ -122,7 +132,7 @@ Obviously you can implement the specified method in class, but for guide purpose
 Setup the trigger
 ^^^^^^^^^^^^^^^^^
 
-First, put the trigger in any path it can be exported, e.g. by packing the resource into python package (which will lead to import path as ``package.slack_reporter.SlackReporter``) or just put file somewhere it can be accessed by application (e.g. ``/usr/local/lib/slack_reporter.py.SlackReporter``).
+First, put the trigger in any path it can be exported, e.g. by packing the resource into python package (which will lead to import path as ``package.slack_reporter.SlackReporter``) or just put file somewhere it can be accessed by application (e.g. ``/usr/local/lib/slack_reporter.SlackReporter``).
 
 After that run application as usual and receive notification in your slack channel.
 

package/archlinux/PKGBUILD

@@ -1,14 +1,14 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.8.0
+pkgver=2.11.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
 url="https://github.com/arcan1s/ahriman"
 license=('GPL3')
-depends=('devtools' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests' 'python-srcinfo')
-makedepends=('python-build' 'python-installer' 'python-wheel')
+depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests' 'python-srcinfo')
+makedepends=('python-build' 'python-flit' 'python-installer' 'python-wheel')
 optdepends=('breezy: -bzr packages support'
             'darcs: -darcs packages support'
             'mercurial: -hg packages support'
@@ -24,11 +24,13 @@ optdepends=('breezy: -bzr packages support'
             'python-cryptography: web server with authorization'
             'python-requests-unixsocket: client report to web server by unix socket'
             'python-jinja: html report generation'
+            'python-systemd: journal support'
             'rsync: sync by using rsync'
             'subversion: -svn packages support')
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
         'ahriman.sysusers'
         'ahriman.tmpfiles')
+install="$pkgname.install"
 backup=('etc/ahriman.ini'
         'etc/ahriman.ini.d/logging.ini')
 
@@ -43,8 +45,10 @@ package() {
 
   python -m installer --destdir="$pkgdir" "dist/$pkgname-$pkgver-py3-none-any.whl"
 
-  # python-installer actually thinks that you cannot just copy files to root
-  # thus we need to copy them manually
+  # thanks too PEP517, which we all wanted, you need to install data files manually nowadays
+  pushd package && find . \( -type f -or -type l \) -exec install -Dm644 "{}" "$pkgdir/usr/{}" \; && popd
+
+  # keep usr/share configs as reference and copy them to /etc
   install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini" "$pkgdir/etc/ahriman.ini"
   install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini.d/logging.ini" "$pkgdir/etc/ahriman.ini.d/logging.ini"
 
@@ -52,6 +56,6 @@ package() {
   install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }
 
-sha512sums=('112b0d8aac68e5330bbdd2b86a59c8a9af8ab7a7c636489623c8460bb90f1318585851edd2a97a8ce20e2d2ad93b847b522685df707c190aa39d23ab908fa8ef'
+sha512sums=('19841842641520b573cdde6cb80a7cfcd69756d323fdfeebc2eee2d264a1325ead4ab2f8383bb369f7896bfc1de59d7358f133f4afeb90a9b9f0695f482a58d0'
             '53d37efec812afebf86281716259f9ea78a307b83897166c72777251c3eebcb587ecee375d907514781fb2a5c808cbb24ef9f3f244f12740155d0603bf213131'
             '62b2eccc352d33853ef243c9cddd63663014aa97b87242f1b5bc5099a7dbd69ff3821f24ffc58e1b7f2387bd4e9e9712cc4c67f661b1724ad99cdf09b3717794')

package/archlinux/ahriman.install

@@ -0,0 +1,42 @@
+post_upgrade() {
+    local breakpoints=(
+        2.9.0-1
+        2.12.0-1
+    )
+
+    for v in "${breakpoints[@]}"; do
+        if [[ $(vercmp "$v" "$2") -ne "-1" ]]; then
+            "_${v//[.-]/_}_changes"
+        fi
+    done
+}
+
+_2_9_0_1_changes() {
+    cat << EOF
+It was found that you were upgrading from old-devtools package to the new one, which requires manual intervention:
+
+* make sure that devtools are upgraded to the latest release;
+* merge service configuration if required;
+* run setup command (i.e. sudo ahriman service-setup) with the same arguments as you did before;
+* remove build chroot: sudo rm -r /var/lib/ahriman/chroot/ahriman-x86_64/;
+* update local databases: sudo -u ahriman ahriman update --no-aur --no-local --no-manual -yy;
+
+For more information kindly refer to migration notes https://ahriman.readthedocs.io/en/stable/migration.html
+EOF
+}
+
+_2_12_0_1_changes() {
+    cat << EOF
+Whereas old tree is still supported it is highly recommended to migrate to the new one:
+
+* stop and disable all services;
+* run service-tree-migrate as ahriman user;
+* edit configuration to avoid pointing to the old paths;
+* update devtools pacman configuration (e.g. /usr/share/devtools/pacman.conf.d/ahriman-x86_64.conf) with new repository path;
+* update synchronization services in order to support new paths (or setup redirects);
+* enable web and timer services again by using x86_64-aur-clone suffix, where x86_64 is your architecture and
+  aur-clone is repository name;
+
+For more information kindly refer to migration notes https://ahriman.readthedocs.io/en/stable/migration.html
+EOF
+}

package/archlinux/ahriman.tmpfiles

@@ -1,2 +1 @@
 d /var/lib/ahriman 0755 ahriman ahriman
-d /var/log/ahriman 0755 ahriman ahriman

package/bin/ahriman

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec python -B -m ahriman.application.ahriman "$@"

package/lib/systemd/system/ahriman-web.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=ArcH linux ReposItory MANager web server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/ahriman web
+User=ahriman
+Group=ahriman
+
+[Install]
+WantedBy=multi-user.target

package/lib/systemd/system/ahriman-web@.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=ArcH linux ReposItory MANager web server (%I architecture)
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/ahriman --architecture %i web
-User=ahriman
-Group=ahriman
-
-[Install]
-WantedBy=multi-user.target

package/lib/systemd/system/ahriman-web@.service

@@ -0,0 +1 @@
+ahriman-web.service

package/lib/systemd/system/ahriman@.service

@@ -1,7 +1,7 @@
 [Unit]
-Description=ArcH linux ReposItory MANager (%I architecture)
+Description=ArcH linux ReposItory MANager (%i)
 
 [Service]
-ExecStart=/usr/bin/ahriman --architecture %i repo-update --refresh
+ExecStart=/usr/bin/ahriman --repository-id "%I" repo-update --refresh
 User=ahriman
 Group=ahriman

package/lib/systemd/system/ahriman@.timer

@@ -1,5 +1,5 @@
 [Unit]
-Description=ArcH linux ReposItory MANager timer (%I architecture)
+Description=ArcH linux ReposItory MANager timer (%i)
 
 [Timer]
 OnCalendar=daily

package/share/ahriman/settings/ahriman.ini

@@ -1,13 +1,14 @@
 [settings]
 include = ahriman.ini.d
 logging = ahriman.ini.d/logging.ini
+apply_migrations = yes
 database = /var/lib/ahriman/ahriman.db
 suppress_http_log_errors = yes
 
 [alpm]
 database = /var/lib/pacman
 mirror = https://geo.mirror.pkgbuild.com/$repo/os/$arch
-repositories = core extra community multilib
+repositories = core extra multilib
 root = /
 use_ahriman_cache = yes
 
@@ -20,20 +21,25 @@ allow_read_only = yes
 
 [build]
 archbuild_flags =
-build_command = extra-x86_64-build
 ignore_packages =
 makechrootpkg_flags =
 makepkg_flags = --nocolor --ignorearch
 triggers = ahriman.core.gitremote.RemotePullTrigger ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger ahriman.core.gitremote.RemotePushTrigger
+triggers_known = 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
 
 [repository]
-name = aur-clone
 root = /var/lib/ahriman
 
 [sign]
 target =
 
+[keyring]
+target =
+
+[mirrorlist]
+target =
+
 [remote-pull]
 target =
 
@@ -48,14 +54,17 @@ use_utf = yes
 
 [email]
 no_empty_report = yes
-template_path = /usr/share/ahriman/templates/email-index.jinja2
+template = email-index.jinja2
+templates = /usr/share/ahriman/templates
 ssl = disabled
 
 [html]
-template_path = /usr/share/ahriman/templates/repo-index.jinja2
+template = repo-index.jinja2
+templates = /usr/share/ahriman/templates
 
 [telegram]
-template_path = /usr/share/ahriman/templates/telegram-index.jinja2
+template = telegram-index.jinja2
+templates = /usr/share/ahriman/templates
 
 [upload]
 target =

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

@@ -2,17 +2,23 @@
 keys = root,http,stderr,boto3,botocore,nose,s3transfer
 
 [handlers]
-keys = console_handler,syslog_handler
+keys = console_handler,journald_handler,syslog_handler
 
 [formatters]
 keys = generic_format,syslog_format
 
 [handler_console_handler]
-class = StreamHandler
+class = logging.StreamHandler
 level = DEBUG
 formatter = generic_format
 args = (sys.stderr,)
 
+[handler_journald_handler]
+class = ahriman.core.log.journal_handler.JournalHandler
+level = DEBUG
+formatter = syslog_format
+kwargs = {"SYSLOG_IDENTIFIER": "ahriman"}
+
 [handler_syslog_handler]
 class = logging.handlers.SysLogHandler
 level = DEBUG
@@ -21,20 +27,16 @@ args = ("/dev/log",)
 
 [formatter_generic_format]
 format = [%(levelname)s %(asctime)s] [%(name)s]: %(message)s
-datefmt =
 
 [formatter_syslog_format]
 format = [%(levelname)s] [%(name)s]: %(message)s
-datefmt =
 
 [logger_root]
 level = DEBUG
-handlers = syslog_handler
 qualname = root
 
 [logger_http]
 level = DEBUG
-handlers = syslog_handler
 qualname = http
 propagate = 0
 
@@ -45,24 +47,20 @@ qualname = stderr
 
 [logger_boto3]
 level = INFO
-handlers = syslog_handler
 qualname = boto3
 propagate = 0
 
 [logger_botocore]
 level = INFO
-handlers = syslog_handler
 qualname = botocore
 propagate = 0
 
 [logger_nose]
 level = INFO
-handlers = syslog_handler
 qualname = nose
 propagate = 0
 
 [logger_s3transfer]
 level = INFO
-handlers = syslog_handler
 qualname = s3transfer
 propagate = 0

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

@@ -1,13 +1,14 @@
 <!doctype html>
 <html lang="en">
     <head>
-        <title>{{ repository }}</title>
+        <title>ahriman</title>
 
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <link rel="shortcut icon" href="/static/favicon.ico">
 
         {% include "utils/style.jinja2" %}
+        {% include "user-style.jinja2" ignore missing %}
     </head>
 
     <body>
@@ -15,7 +16,22 @@
         {% include "utils/bootstrap-scripts.jinja2" %}
 
         <div class="container">
-            <h1 id="badge-repository">ahriman</h1>
+            <nav class="navbar navbar-expand-lg">
+                <div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""> ahriman</div>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-supported-content" aria-controls="navbar-supported-content" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+
+                <div id="navbar-supported-content" class="collapse navbar-collapse">
+                    <ul id="repositories" class="nav nav-tabs">
+                        {% for repository in repositories %}
+                            <li class="nav-item">
+                                <a id="{{ repository.id }}-lnk" class="nav-link" href="#{{ repository.id }}" data-repository="{{ repository.repository }}" data-architecture="{{ repository.architecture }}">{{ repository.repository }} ({{ repository.architecture }})</a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </nav>
         </div>
 
         <div id="alert-placeholder" class="toast-container p3 top-0 start-50 translate-middle-x"></div>
@@ -30,28 +46,28 @@
                     </button>
                     <ul class="dropdown-menu">
                         <li>
-                            <button id="package-add-btn" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-add-modal" hidden>
+                            <button id="package-add-button" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-add-modal" hidden>
                                 <i class="bi bi-plus"></i> add
                             </button>
                         </li>
                         <li>
-                            <button id="package-update-btn" class="btn dropdown-item" onclick="updatePackages()" hidden>
+                            <button id="package-update-button" class="btn dropdown-item" onclick="updatePackages()" hidden>
                                 <i class="bi bi-play"></i> update
                             </button>
                         </li>
                         <li>
-                            <button id="package-rebuild-btn" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-rebuild-modal" hidden>
+                            <button id="package-rebuild-button" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-rebuild-modal" hidden>
                                 <i class="bi bi-arrow-clockwise"></i> rebuild
                             </button>
                         </li>
                         <li>
-                            <button id="package-remove-btn" class="btn dropdown-item" onclick="removePackages()" disabled hidden>
+                            <button id="package-remove-button" class="btn dropdown-item" onclick="removePackages()" disabled hidden>
                                 <i class="bi bi-trash"></i> remove
                             </button>
                         </li>
                     </ul>
 
-                    <button id="key-import-btn" type="button" class="btn btn-info" data-bs-toggle="modal" data-bs-target="#key-import-modal" hidden>
+                    <button id="key-import-button" type="button" class="btn btn-info" data-bs-toggle="modal" data-bs-target="#key-import-modal" hidden>
                         <i class="bi bi-key"></i> import key
                     </button>
                 {% endif %}
@@ -63,6 +79,8 @@
 
             <table id="packages" class="table table-striped table-hover"
                    data-export-options='{"fileName": "packages"}'
+                   data-filter-control="true"
+                   data-filter-control-visible="false"
                    data-page-list="[10, 25, 50, 100, all]"
                    data-page-size="10"
                    data-pagination="true"
@@ -72,6 +90,7 @@
                    data-show-columns-search="true"
                    data-show-columns-toggle-all="true"
                    data-show-export="true"
+                   data-show-filter-control-switch="true"
                    data-show-fullscreen="true"
                    data-show-search-clear-button="true"
                    data-sortable="true"
@@ -82,13 +101,14 @@
                 <thead class="table-primary">
                     <tr>
                         <th data-checkbox="true"></th>
-                        <th data-sortable="true" data-switchable="false" data-field="base">package base</th>
-                        <th data-sortable="true" data-field="version">version</th>
-                        <th data-sortable="true" data-field="packages">packages</th>
-                        <th data-sortable="true" data-visible="false" data-field="groups">groups</th>
-                        <th data-sortable="true" data-visible="false" data-field="licenses">licenses</th>
-                        <th data-sortable="true" data-field="timestamp">last update</th>
-                        <th data-sortable="true" data-cell-style="statusFormat" data-field="status">status</th>
+                        <th data-sortable="true" data-switchable="false" data-field="base" data-filter-control="input" data-filter-control-placeholder="(any base)">package base</th>
+                        <th data-sortable="true" data-field="version" data-filter-control="input" data-filter-control-placeholder="(any version)">version</th>
+                        <th data-sortable="true" data-field="packages" data-filter-control="input" data-filter-control-placeholder="(any package)">packages</th>
+                        <th data-sortable="true" data-visible="false" data-field="groups" data-filter-control="select" data-filter-data="func:filterListGroups" data-filter-custom-search="filterList" data-filter-control-placeholder="(any group)">groups</th>
+                        <th data-sortable="true" data-visible="false" data-field="licenses" data-filter-control="select" data-filter-data="func:filterListLicenses" data-filter-custom-search="filterList" data-filter-control-placeholder="(any license)">licenses</th>
+                        <th data-sortable="true" data-visible="false" data-field="packager" data-filter-control="select" data-filter-custom-search="filterContains" data-filter-control-placeholder="(any packager)">packager</th>
+                        <th data-sortable="true" data-field="timestamp" data-filter-control="input" data-filter-custom-search="filterDateRange" data-filter-control-placeholder="(any date)">last update</th>
+                        <th data-sortable="true" data-cell-style="statusFormat" data-field="status" data-filter-control="select" data-filter-control-placeholder="(any status)">status</th>
                     </tr>
                 </thead>
             </table>
@@ -112,7 +132,7 @@
                 {% if auth.enabled %}
                     <ul class="nav">
                         {% if auth.username is none %}
-                            <li>{{ auth.control|safe }}</li>
+                            <li>{{ auth.control | safe }}</li>
                         {% else %}
                             <li>
                                 <form action="/api/v1/logout" method="post">

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

@@ -8,21 +8,21 @@
                 </div>
                 <div class="modal-body">
                     <div class="form-group row">
-                        <label for="key-fingerprint-input" class="col-sm-2 col-form-label">fingerprint</label>
+                        <label for="key-import-fingerprint-input" class="col-sm-2 col-form-label">fingerprint</label>
                         <div class="col-sm-10">
-                            <input id="key-fingerprint-input" type="text" class="form-control" placeholder="PGP key fingerprint" name="key" required>
+                            <input id="key-import-fingerprint-input" type="text" class="form-control" placeholder="PGP key fingerprint" name="key" required>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="key-server-input" class="col-sm-2 col-form-label">key server</label>
+                        <label for="key-import-server-input" class="col-sm-2 col-form-label">key server</label>
                         <div class="col-sm-10">
-                            <input id="key-server-input" type="text" class="form-control" placeholder="PGP key server" name="server" value="keyserver.ubuntu.com" required>
+                            <input id="key-import-server-input" type="text" class="form-control" placeholder="PGP key server" name="server" value="keyserver.ubuntu.com" required>
                         </div>
                     </div>
                     <div class="form-group row">
                         <div class="col-sm-2"></div>
                         <div class="col-sm-10">
-                            <pre class="language-less"><samp id="key-body-input" class="pre-scrollable language-less"></samp><button id="key-copy-btn" type="button" class="btn language-less" onclick="copyPgpKey()"><i class="bi bi-clipboard"></i> copy</button></pre>
+                            <pre class="language-less"><samp id="key-import-body-input" class="pre-scrollable language-less"></samp><button id="key-import-copy-button" type="button" class="btn language-less" onclick="copyPgpKey()"><i class="bi bi-clipboard"></i> copy</button></pre>
                         </div>
                     </div>
                 </div>
@@ -39,24 +39,24 @@
     const keyImportModal = $("#key-import-modal");
     const keyImportForm = $("#key-import-form");
     keyImportModal.on("hidden.bs.modal", () => {
-        keyBodyInput.text("");
+        keyImportBodyInput.text("");
         keyImportForm.trigger("reset");
     });
 
-    const keyBodyInput = $("#key-body-input");
-    const keyCopyButton = $("#key-copy-btn");
+    const keyImportBodyInput = $("#key-import-body-input");
+    const keyImportCopyButton = $("#key-import-copy-button");
 
-    const keyFingerprintInput = $("#key-fingerprint-input");
-    const keyServerInput = $("#key-server-input");
+    const keyImportFingerprintInput = $("#key-import-fingerprint-input");
+    const keyImportServerInput = $("#key-import-server-input");
 
     async function copyPgpKey() {
-        const logs = keyBodyInput.text();
-        await copyToClipboard(logs, keyCopyButton);
+        const logs = keyImportBodyInput.text();
+        await copyToClipboard(logs, keyImportCopyButton);
     }
 
     function fetchPgpKey() {
-        const key = keyFingerprintInput.val();
-        const server = keyServerInput.val();
+        const key = keyImportFingerprintInput.val();
+        const server = keyImportServerInput.val();
 
         if (key && server) {
             $.ajax({
@@ -64,14 +64,14 @@
                 data: {"key": key, "server": server},
                 type: "GET",
                 dataType: "json",
-                success: response => { keyBodyInput.text(response.key); },
+                success: response => { keyImportBodyInput.text(response.key); },
             });
         }
     }
 
     function importPgpKey() {
-        const key = keyFingerprintInput.val();
-        const server = keyServerInput.val();
+        const key = keyImportFingerprintInput.val();
+        const server = keyImportServerInput.val();
 
         if (key && server) {
             $.ajax({
@@ -84,7 +84,7 @@
                     showSuccess("Success", `Key ${key} has been imported`);
                 },
                 error: (jqXHR, _, errorThrown) => {
-                    const message = _ => { return `Could not import key ${key} from ${server}`; };
+                    const message = _ => `Could not import key ${key} from ${server}`;
                     showFailure("Action failed", message, jqXHR, errorThrown);
                 },
             });

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

@@ -8,18 +8,18 @@
                 </div>
                 <div class="modal-body">
                     <div class="form-group row">
-                        <label for="username" class="col-sm-2 col-form-label">username</label>
-                        <div class="col-sm-10">
-                            <input id="username" type="text" class="form-control" placeholder="enter username" name="username" required>
+                        <label for="login-username" class="col-sm-4 col-form-label">username</label>
+                        <div class="col-sm-8">
+                            <input id="login-username" type="text" class="form-control" placeholder="enter username" name="username" required>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="password" class="col-sm-2 col-form-label">password</label>
-                        <div class="col-sm-10">
+                        <label for="login-password" class="col-sm-4 col-form-label">password</label>
+                        <div class="col-sm-8">
                             <div class="input-group">
-                                <input id="password" type="password" class="form-control" placeholder="enter password" name="password" required>
+                                <input id="login-password" type="password" class="form-control" placeholder="enter password" name="password" required>
                                 <div class="input-group-append">
-                                    <button class="btn btn-outline-secondary" type="button" onclick="showPassword()"><i id="show-hide-password-btn" class="bi bi-eye"></i></button>
+                                    <button class="btn btn-outline-secondary" type="button" onclick="showPassword()"><i id="login-show-hide-password-button" class="bi bi-eye"></i></button>
                                 </div>
                             </div>
                         </div>
@@ -34,8 +34,8 @@
 </div>
 
 <script>
-    const passwordInput = $("#password");
-    const showHidePasswordButton = $("#show-hide-password-btn");
+    const passwordInput = $("#login-password");
+    const showHidePasswordButton = $("#login-show-hide-password-button");
 
     function showPassword() {
         if (passwordInput.attr("type") === "password") {

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

@@ -8,10 +8,20 @@
                 </div>
                 <div class="modal-body">
                     <div class="form-group row">
-                        <label for="package-input" class="col-sm-2 col-form-label">package</label>
-                        <div class="col-sm-10">
-                            <input id="package-input" type="text" list="known-packages-dlist" autocomplete="off" class="form-control" placeholder="AUR package" name="package" required>
-                            <datalist id="known-packages-dlist"></datalist>
+                        <label for="package-add-repository-input" class="col-sm-4 col-form-label">repository</label>
+                        <div class="col-sm-8">
+                            <select id="package-add-repository-input" class="form-control" name="repository" required>
+                                {% for repository in repositories %}
+                                    <option value="{{ repository.id }}" data-repository="{{ repository.repository }}" data-architecture="{{ repository.architecture }}">{{ repository.repository }} ({{ repository.architecture }})</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="package-add-input" class="col-sm-4 col-form-label">package</label>
+                        <div class="col-sm-8">
+                            <input id="package-add-input" type="text" list="known-packages-dlist" autocomplete="off" class="form-control" placeholder="AUR package" name="package" required>
+                            <datalist id="package-add-known-packages-dlist"></datalist>
                         </div>
                     </div>
                 </div>
@@ -27,14 +37,19 @@
 <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", () => { packageAddForm.trigger("reset"); });
 
-    const packageInput = $("#package-input");
-    const knownPackagesList = $("#known-packages-dlist");
-    packageInput.keyup(() => {
-        clearTimeout(packageInput.data("timeout"));
-        packageInput.data("timeout", setTimeout($.proxy(() => {
-            const value = packageInput.val();
+    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({
@@ -49,7 +64,7 @@
                             option.innerText = `${pkg.package} (${pkg.description})`;
                             return option;
                         });
-                        knownPackagesList.empty().append(options);
+                        packageAddKnownPackagesList.empty().append(options);
                     },
                 });
             }
@@ -57,22 +72,24 @@
     });
 
     function packagesAdd() {
-        const packages = packageInput.val();
+        const packages = packageAddInput.val();
+        const repository = getRepositorySelector(packageAddRepositoryInput);
         if (packages) {
             packageAddModal.modal("hide");
-            const onSuccess = update => { return `Packages ${update} have been added`; };
-            const onFailure = error => { return `Package addition failed: ${error}`; };
-            doPackageAction("/api/v1/service/add", [packages], onSuccess, onFailure);
+            const onSuccess = update => `Packages ${update} have been added`;
+            const onFailure = error => `Package addition failed: ${error}`;
+            doPackageAction("/api/v1/service/add", [packages], repository, onSuccess, onFailure);
         }
     }
 
     function packagesRequest() {
-        const packages = packageInput.val();
+        const packages = packageAddInput.val();
+        const repository = getRepositorySelector(packageAddRepositoryInput);
         if (packages) {
             packageAddModal.modal("hide");
-            const onSuccess = update => { return `Packages ${update} have been requested`; };
-            const onFailure = error => { return `Package request failed: ${error}`; };
-            doPackageAction("/api/v1/service/request", [packages], onSuccess, onFailure);
+            const onSuccess = update => `Packages ${update} have been requested`;
+            const onFailure = error => `Package request failed: ${error}`;
+            doPackageAction("/api/v1/service/request", [packages], repository, onSuccess, onFailure);
         }
     }
 </script>

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

@@ -6,7 +6,7 @@
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
             </div>
             <div class="modal-body">
-                <pre class="language-logs"><samp id="package-info-logs-input" class="pre-scrollable language-logs"></samp><button id="logs-copy-btn" type="button" class="btn language-logs" onclick="copyLogs()"><i class="bi bi-clipboard"></i> copy</button></pre>
+                <pre class="language-logs"><samp id="package-info-logs-input" class="pre-scrollable language-logs"></samp><button id="package-info-logs-copy-button" type="button" class="btn language-logs" onclick="copyLogs()"><i class="bi bi-clipboard"></i> copy</button></pre>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" onclick="showLogs()"><i class="bi bi-arrow-clockwise"></i> reload</button>
@@ -22,7 +22,7 @@
     const packageInfo = $("#package-info");
 
     const packageInfoLogsInput = $("#package-info-logs-input");
-    const packageInfoLogsCopyButton = $("#logs-copy-btn");
+    const packageInfoLogsCopyButton = $("#package-info-logs-copy-button");
 
     async function copyLogs() {
         const logs = packageInfoLogsInput.text();
@@ -45,12 +45,20 @@
         };
 
         $.ajax({
-            url: `/api/v1/packages/${packageBase}/logs`,
+            url: `/api/v2/packages/${packageBase}/logs`,
+            data: {
+                architecture: repository.architecture,
+                repository: repository.repository,
+            },
             type: "GET",
             dataType: "json",
             success: response => {
                 packageInfo.text(`${response.package_base} ${response.status.status} at ${new Date(1000 * response.status.timestamp).toISOString()}`);
-                packageInfoLogsInput.text(response.logs);
+                const logs = response.logs.map(log_record => {
+                    const [timestamp, record] = log_record;
+                    return `[${new Date(1000 * timestamp).toISOString()}] ${record}`;
+                });
+                packageInfoLogsInput.text(logs.join("\n"));
 
                 packageInfoModalHeader.removeClass();
                 packageInfoModalHeader.addClass("modal-header");
@@ -61,7 +69,7 @@
             error: (jqXHR, _, errorThrown) => {
                 // show failed modal in case if first time loading
                 if (isPackageBaseSet) {
-                    const message = error => { return `Could not load package ${packageBase} logs: ${error}`; };
+                    const message = error => `Could not load package ${packageBase} logs: ${error}`;
                     showFailure("Load failure", message, jqXHR, errorThrown);
                 }
             },

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

@@ -8,9 +8,19 @@
                 </div>
                 <div class="modal-body">
                     <div class="form-group row">
-                        <label for="dependency-input" class="col-sm-4 col-form-label">dependency</label>
+                        <label for="package-rebuild-repository-input" class="col-sm-4 col-form-label">repository</label>
                         <div class="col-sm-8">
-                            <input id="dependency-input" type="text" class="form-control" placeholder="packages dependency" name="package" required>
+                            <select id="package-rebuild-repository-input" class="form-control" name="repository" required>
+                                {% for repository in repositories %}
+                                    <option value="{{ repository.id }}" data-repository="{{ repository.repository }}" data-architecture="{{ repository.architecture }}">{{ repository.repository }} ({{ repository.architecture }})</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="package-rebuild-dependency-input" class="col-sm-4 col-form-label">dependency</label>
+                        <div class="col-sm-8">
+                            <input id="package-rebuild-dependency-input" type="text" class="form-control" placeholder="packages dependency" name="package" required>
                         </div>
                     </div>
                 </div>
@@ -25,17 +35,23 @@
 <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 dependencyInput = $("#dependency-input");
+    const packageRebuildDependencyInput = $("#package-rebuild-dependency-input");
+    const packageRebuildRepositoryInput = $("#package-rebuild-repository-input");
 
     function packagesRebuild() {
-        const packages = dependencyInput.val();
+        const packages = packageRebuildDependencyInput.val();
+        const repository = getRepositorySelector(packageRebuildRepositoryInput);
         if (packages) {
             packageRebuildModal.modal("hide");
-            const onSuccess = update => { return `Repository rebuild has been run for packages which depend on ${update}`; };
-            const onFailure = error => { return `Repository rebuild failed: ${error}`; };
-            doPackageAction("/api/v1/service/rebuild", [packages], onSuccess, onFailure);
+            const onSuccess = update => `Repository rebuild has been run for packages which depend on ${update}`;
+            const onFailure = error => `Repository rebuild failed: ${error}`;
+            doPackageAction("/api/v1/service/rebuild", [packages], repository, onSuccess, onFailure);
         }
     }
 </script>

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

@@ -1,9 +1,21 @@
 <script>
-    const keyImportButton = $("#key-import-btn");
-    const packageAddButton = $("#package-add-btn");
-    const packageRebuildButton = $("#package-rebuild-btn");
-    const packageRemoveButton = $("#package-remove-btn");
-    const packageUpdateButton = $("#package-update-btn");
+    const keyImportButton = $("#key-import-button");
+    const packageAddButton = $("#package-add-button");
+    const packageRebuildButton = $("#package-rebuild-button");
+    const packageRemoveButton = $("#package-remove-button");
+    const packageUpdateButton = $("#package-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 ${safe(repository.repository)} (${safe(repository.architecture)})`);
+        $(`#${element.id}`).tab("show");
+        reload();
+    });
 
     const table = $("#packages");
     table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
@@ -15,14 +27,37 @@
             table.bootstrapTable(method, {field: "id", values: [data.id]});
         } else showLogs(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 repositoryBadge = $("#badge-repository");
     const statusBadge = $("#badge-status");
     const versionBadge = $("#badge-version");
 
-    function doPackageAction(uri, packages, successText, failureText) {
+    function doPackageAction(uri, packages, repository, successText, failureText) {
+        const queryParams = $.param({
+            architecture: repository.architecture,
+            repository: repository.repository,
+        }); // it will never be empty btw
+
         $.ajax({
-            url: uri,
+            url: `${uri}?${queryParams}`,
             data: JSON.stringify({packages: packages}),
             type: "POST",
             contentType: "application/json",
@@ -37,22 +72,28 @@
     }
 
     function getSelection() {
-        return table.bootstrapTable("getSelections").map(row => { return row.id; });
+        return table.bootstrapTable("getSelections").map(row => row.id);
     }
 
     function removePackages() {
-        const onSuccess = update => { return `Packages ${update} have been removed`; };
-        const onFailure = error => { return `Could not remove packages: ${error}`; };
-        doPackageAction("/api/v1/service/remove", getSelection(), onSuccess, onFailure);
+        const onSuccess = update => `Packages ${update} have been removed`;
+        const onFailure = error => `Could not remove packages: ${error}`;
+        doPackageAction("/api/v1/service/remove", getSelection(), repository, onSuccess, onFailure);
+    }
+
+    function selectRepository() {
+        const fragment = window.location.hash.replace("#", "") || "{{ repositories[0].id }}";
+        const element = $(`#${fragment}-lnk`);
+        element.click();
     }
 
     function updatePackages() {
         const currentSelection = getSelection();
         const [url, onSuccess] = currentSelection.length === 0
-            ? ["/api/v1/service/update", _ => { return "Repository update has been run"; }]
-            : ["/api/v1/service/add", update => { return `Run update for packages ${update}`; }];
-        const onFailure = error => { return `Packages update failed: ${error}`; };
-        doPackageAction(url, currentSelection, onSuccess, onFailure);
+            ? ["/api/v1/service/update", _ => `Repository update has been run`]
+            : ["/api/v1/service/add", update => `Run update for packages ${update}`];
+        const onFailure = error => `Packages update failed: ${error}`;
+        doPackageAction(url, currentSelection, repository, onSuccess, onFailure);
     }
 
     function hideControls(hidden) {
@@ -76,28 +117,33 @@
 
         $.ajax({
             url: "/api/v1/packages",
+            data: {
+                architecture: repository.architecture,
+                repository: repository.repository,
+            },
             type: "GET",
             dataType: "json",
             success: response => {
                 const extractListProperties = (description, property) => {
                     return Object.values(description.packages)
-                        .map(pkg => { return pkg[property]; })
-                        .reduce((left, right) => { return left.concat(right); }, []);
+                        .map(pkg => pkg[property])
+                        .reduce((left, right) => left.concat(right), []);
                 };
                 const listToTable = data => {
                     return Array.from(new Set(data))
                         .sort()
-                        .map(entry => { return safe(entry); })
+                        .map(entry => safe(entry))
                         .join("<br>");
                 };
 
                 const payload = response.map(description => {
                     const package_base = description.package.base;
-                    const web_url = description.package.remote?.web_url;
+                    const web_url = description.package.remote.web_url;
                     return {
                         id: package_base,
                         base: web_url ? `<a href="${safe(web_url)}" title="${safe(package_base)}">${safe(package_base)}</a>` : safe(package_base),
                         version: safe(description.package.version),
+                        packager: description.package.packager ? safe(description.package.packager) : "",
                         packages: listToTable(Object.keys(description.package.packages)),
                         groups: listToTable(extractListProperties(description.package, "groups")),
                         licenses: listToTable(extractListProperties(description.package, "licenses")),
@@ -120,8 +166,8 @@
                     table.bootstrapTable("hideLoading");
                 } else {
                     // other errors
-                    const messaga = error => { return `Could not load list of packages: ${error}`; };
-                    showFailure("Load failure", messaga, jqXHR, errorThrown);
+                    const message = error => `Could not load list of packages: ${error}`;
+                    showFailure("Load failure", message, jqXHR, errorThrown);
                 }
                 hideControls(true);
             },
@@ -129,10 +175,13 @@
 
         $.ajax({
             url: "/api/v1/status",
+            data: {
+                architecture: repository.architecture,
+                repository: repository.repository,
+            },
             type: "GET",
             dataType: "json",
             success: response => {
-                repositoryBadge.text(`${response.repository} ${response.architecture}`);
                 versionBadge.html(`<i class="bi bi-github"></i> ahriman ${safe(response.version)}`);
 
                 statusBadge
@@ -157,9 +206,29 @@
         return {classes: cellClass(value)};
     }
 
+    function filterListGroups() {
+        return extractDataList(table.bootstrapTable("getData"), "groups");
+    }
+
+    function filterListLicenses() {
+        return extractDataList(table.bootstrapTable("getData"), "licenses");
+    }
+
+    function filterListPackagers() {
+        return extractDataList(table.bootstrapTable("getData"), "packager");
+    }
+
+    function getRepositorySelector(selector) {
+        const selected = selector.find(":selected");
+        return {
+            architecture: selected.data("architecture"),
+            repository: selected.data("repository"),
+        };
+    }
+
     $(() => {
         table.bootstrapTable({});
         statusBadge.popover();
-        reload();
+        selectRepository();
     });
 </script>

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

@@ -7,6 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         {% include "utils/style.jinja2" %}
+        {% include "user-style.jinja2" ignore missing %}
     </head>
 
     <body>

package/share/ahriman/templates/error.jinja2

@@ -8,6 +8,7 @@
         <link rel="shortcut icon" href="/static/favicon.ico">
 
         {% include "utils/style.jinja2" %}
+        {% include "user-style.jinja2" ignore missing %}
     </head>
 
     <body>

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

@@ -6,6 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         {% include "utils/style.jinja2" %}
+        {% include "user-style.jinja2" ignore missing %}
     </head>
 
     <body>
@@ -31,6 +32,8 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
         <div class="container">
             <table id="packages" class="table table-striped table-hover"
                    data-export-options='{"fileName": "packages"}'
+                   data-filter-control="true"
+                   data-filter-control-visible="false"
                    data-page-list="[10, 25, 50, 100, all]"
                    data-page-size="10"
                    data-pagination="true"
@@ -40,6 +43,7 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
                    data-show-columns-search="true"
                    data-show-columns-toggle-all="true"
                    data-show-export="true"
+                   data-show-filter-control-switch="true"
                    data-show-fullscreen="true"
                    data-show-search-clear-button="true"
                    data-sortable="true"
@@ -48,17 +52,17 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
                    data-toggle="table">
                 <thead class="table-primary">
                     <tr>
-                        <th data-sortable="true" data-switchable="false">package</th>
-                        <th data-sortable="true">version</th>
-                        <th data-sortable="true" data-visible="false">architecture</th>
-                        <th data-sortable="true" data-visible="false">description</th>
-                        <th data-sortable="true" data-visible="false">upstream url</th>
-                        <th data-sortable="true" data-visible="false">licenses</th>
-                        <th data-sortable="true" data-visible="false">groups</th>
-                        <th data-sortable="true" data-visible="false">depends</th>
-                        <th data-sortable="true">archive size</th>
-                        <th data-sortable="true">installed size</th>
-                        <th data-sortable="true">build date</th>
+                        <th data-sortable="true" data-switchable="false" data-field="name" data-filter-control="input" data-filter-control-placeholder="(any package)">package</th>
+                        <th data-sortable="true" data-field="version" data-filter-control="input" data-filter-control-placeholder="(any version)">version</th>
+                        <th data-sortable="true" data-visible="false" data-field="architecture" data-filter-control="select" data-filter-control-placeholder="(any arch)">architecture</th>
+                        <th data-sortable="true" data-visible="false" data-field="description" data-filter-control="input" data-filter-control-placeholder="(any description)">description</th>
+                        <th data-sortable="true" data-visible="false" data-field="url">upstream url</th>
+                        <th data-sortable="true" data-visible="false" data-field="licenses" data-filter-control="select" data-filter-data="func:filterListLicenses" data-filter-custom-search="filterList" data-filter-control-placeholder="(any license)">licenses</th>
+                        <th data-sortable="true" data-visible="false" data-field="groups" data-filter-control="select" data-filter-data="func:filterListGroups" data-filter-custom-search="filterList" data-filter-control-placeholder="(any group)">groups</th>
+                        <th data-sortable="true" data-visible="false" data-field="depends" data-filter-control="select" data-filter-data="func:filterListDepends" data-filter-custom-search="filterList" data-filter-control-placeholder="(any depends)">depends</th>
+                        <th data-sortable="true" data-field="archive_size">archive size</th>
+                        <th data-sortable="true" data-field="installed_size">installed size</th>
+                        <th data-sortable="true" data-field="timestamp" data-filter-control="input" data-filter-custom-search="filterDateRange" data-filter-control-placeholder="(any date)">build date</th>
                     </tr>
                 </thead>
 
@@ -70,9 +74,9 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
                         <td>{{ package.architecture }}</td>
                         <td>{{ package.description }}</td>
                         <td><a href="{{ package.url }}" title="{{ package.name }} upstream url">{{ package.url }}</a></td>
-                        <td>{{ package.licenses|join("<br>"|safe) }}</td>
-                        <td>{{ package.groups|join("<br>"|safe) }}</td>
-                        <td>{{ package.depends|join("<br>"|safe) }}</td>
+                        <td>{{ package.licenses | join("<br>" | safe) }}</td>
+                        <td>{{ package.groups | join("<br>" | safe) }}</td>
+                        <td>{{ package.depends | join("<br>" | safe) }}</td>
                         <td>{{ package.archive_size }}</td>
                         <td>{{ package.installed_size }}</td>
                         <td>{{ package.build_date }}</td>
@@ -96,6 +100,27 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
         </div>
 
         <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");
 
@@ -103,6 +128,18 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
                 const conf = pacmanConf.text();
                 await copyToClipboard(conf, pacmanConfCopyButton);
             }
+
+            function filterListDepends() {
+                return extractDataList(table.bootstrapTable("getData"), "depends");
+            }
+
+            function filterListGroups() {
+                return extractDataList(table.bootstrapTable("getData"), "groups");
+            }
+
+            function filterListLicenses() {
+                return extractDataList(table.bootstrapTable("getData"), "licenses");
+            }
         </script>
 
     </body>

package/share/ahriman/templates/static/logo.svg

@@ -0,0 +1,70 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="256.000000pt" height="256.000000pt" viewBox="0 0 256.000000 256.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,256.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1019 2546 c-51 -18 -92 -49 -136 -103 -34 -41 -83 -73 -112 -73 -6
+0 4 22 20 49 17 27 30 54 28 59 -7 17 -153 -102 -176 -143 -13 -23 -30 -40
+-40 -40 -15 0 -18 9 -18 61 0 49 6 73 33 125 l33 64 -42 -40 c-50 -49 -82 -97
+-98 -150 -31 -102 -43 -125 -77 -146 -19 -11 -48 -42 -65 -67 -17 -26 -62 -76
+-100 -112 -69 -66 -69 -66 -69 -120 0 -30 5 -62 10 -70 5 -8 10 -10 10 -4 0 7
+21 35 46 63 69 77 154 95 154 33 0 -42 -27 -126 -50 -155 l-21 -26 25 -7 c34
+-8 63 10 86 56 27 53 74 105 127 142 42 29 44 32 38 68 -6 33 -3 40 22 60 25
+20 36 22 96 17 83 -7 121 5 137 43 7 16 19 31 28 34 10 3 -9 3 -40 1 -65 -6
+-84 8 -48 37 34 27 118 24 180 -7 57 -29 115 -32 150 -8 l24 17 -24 6 c-14 3
+-27 14 -28 24 -4 17 1 18 46 13 58 -7 118 -34 147 -67 38 -44 107 -80 149 -80
+36 1 38 2 21 12 -41 23 -115 108 -115 133 0 13 58 -27 94 -64 42 -43 86 -58
+133 -46 28 7 28 7 6 18 -13 5 -23 19 -23 29 0 14 6 19 23 16 17 -2 32 -23 62
+-85 48 -99 63 -115 123 -141 97 -41 101 -40 50 16 -54 60 -80 113 -76 149 l3
+26 58 -47 c61 -50 87 -89 87 -131 0 -43 27 -93 59 -109 38 -20 37 -21 36 11 0
+45 24 38 47 -14 19 -41 22 -63 20 -146 -2 -91 0 -103 25 -148 45 -83 54 -83
+47 2 -6 74 11 155 32 153 20 -2 47 -101 48 -179 1 -65 -3 -88 -22 -122 -24
+-46 -28 -98 -10 -138 14 -30 24 -32 31 -5 8 30 37 25 37 -6 0 -53 -23 -113
+-62 -160 -52 -63 -58 -81 -58 -167 l0 -72 35 65 c40 75 98 135 103 107 4 -19
+-37 -114 -69 -158 -11 -16 -49 -46 -85 -66 -64 -37 -94 -76 -94 -122 0 -20 1
+-21 24 -6 19 13 25 13 35 2 17 -21 -15 -43 -73 -51 -85 -11 -126 -26 -164 -61
+-35 -31 -80 -95 -67 -95 3 0 29 12 57 26 52 26 168 45 168 28 0 -12 -92 -91
+-123 -105 -20 -9 -34 -8 -71 6 -52 20 -104 14 -130 -14 -17 -19 -17 -20 6 -23
+12 -2 24 -11 26 -20 4 -22 -37 -23 -189 -7 -99 11 -104 10 -151 -12 -26 -13
+-48 -27 -48 -30 0 -3 25 -16 55 -28 30 -13 55 -26 55 -31 0 -8 -73 -20 -119
+-20 -44 0 -99 20 -130 46 -37 31 -87 46 -124 38 l-27 -6 22 -18 c16 -13 20
+-22 12 -29 -18 -19 -125 42 -174 100 -45 53 -95 82 -165 95 l-40 7 52 -41 c96
+-76 114 -128 31 -86 -105 52 -120 69 -147 172 -9 31 -21 48 -44 62 -41 25 -61
+26 -49 2 5 -9 7 -23 5 -29 -10 -27 -32 -11 -57 39 -21 43 -26 66 -26 132 0 71
+-4 87 -29 131 -32 55 -80 106 -67 71 21 -58 18 -206 -4 -206 -5 0 -30 43 -56
+95 l-48 96 17 47 c21 57 21 89 2 122 -14 25 -14 25 -15 3 0 -14 -6 -23 -16
+-23 -14 0 -16 8 -10 53 4 28 18 70 31 92 14 22 31 55 40 73 18 37 32 152 19
+152 -5 0 -17 -21 -28 -46 -18 -45 -61 -104 -75 -104 -4 0 -4 32 0 72 6 55 16
+83 40 122 24 37 34 66 37 108 6 75 -1 91 -22 51 -16 -32 -48 -44 -61 -23 -8
+12 22 69 40 76 19 8 41 43 65 105 l21 52 -29 -29 c-16 -16 -48 -40 -71 -54
+-23 -14 -56 -45 -72 -69 -28 -43 -29 -47 -29 -175 0 -186 -12 -220 -43 -122
+-10 29 -15 62 -11 72 4 14 -2 11 -20 -9 -31 -33 -33 -65 -7 -115 21 -40 38
+-112 27 -112 -16 0 -58 35 -71 59 l-14 26 -1 -37 c0 -24 13 -63 36 -108 39
+-76 51 -155 24 -155 -8 0 -20 16 -27 35 l-11 35 -7 -29 c-11 -40 11 -127 43
+-175 15 -22 56 -72 90 -111 70 -78 66 -86 -28 -51 -71 27 -60 7 30 -54 71 -48
+106 -93 86 -112 -4 -4 -46 12 -93 37 -110 58 -109 58 -87 20 29 -49 70 -81
+188 -145 114 -63 148 -94 126 -120 -13 -16 -52 -6 -82 22 -28 25 -21 0 11 -44
+45 -63 100 -83 259 -99 154 -15 221 -29 272 -54 l35 -18 -35 -6 c-56 -10 -164
+-26 -175 -26 -5 -1 15 -10 45 -21 62 -23 124 -27 255 -15 72 6 94 5 109 -7 28
+-21 11 -37 -42 -38 l-47 -1 40 -19 c63 -31 153 -22 244 25 80 41 166 66 224
+66 l38 0 -26 -35 c-15 -19 -48 -48 -73 -66 l-47 -31 72 4 c71 4 72 4 130 59
+66 64 104 86 160 95 27 4 42 2 50 -8 16 -19 4 -34 -43 -58 l-39 -19 54 -1 c71
+0 129 28 181 88 22 26 68 80 102 120 35 41 74 89 87 108 13 19 26 33 28 31 2
+-2 -3 -46 -12 -98 -20 -128 -20 -128 26 -73 52 63 64 91 83 196 18 108 39 150
+69 146 23 -3 27 -20 14 -70 -11 -42 18 -25 49 28 34 58 41 139 20 222 -21 84
+-21 83 19 172 19 43 38 99 41 125 l7 46 38 -68 39 -68 0 88 c0 80 -3 93 -35
+157 -41 80 -47 140 -15 140 11 0 26 -12 34 -27 15 -27 15 -27 16 35 0 54 -4
+70 -29 105 -16 23 -49 57 -74 76 -56 42 -111 153 -122 248 l-7 63 58 -26 c32
+-14 71 -35 86 -45 40 -29 35 -10 -18 60 -34 45 -65 72 -117 103 -118 69 -153
+102 -141 132 9 22 25 20 68 -9 42 -28 43 -26 14 26 -36 65 -136 119 -217 119
+-48 0 -233 88 -211 100 8 4 44 11 80 14 129 14 130 15 58 47 -62 29 -64 29
+-198 23 -121 -6 -138 -5 -153 11 -25 24 -6 43 46 47 l42 3 -35 20 c-25 13 -53
+19 -98 19 -54 0 -74 -6 -143 -42 -76 -39 -139 -54 -139 -33 0 6 45 32 100 60
+l99 50 -55 7 c-76 9 -111 2 -214 -46 -99 -46 -155 -51 -155 -15 0 14 12 24 44
+36 40 14 42 16 20 22 -37 10 -80 8 -120 -7z"/>
+</g>
+</svg>

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

@@ -1,16 +1,21 @@
-<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.0/dist/jquery.min.js" integrity="sha384-NXgwF8Kv9SSAr+jemKKcbvQsz+teULH/a5UNJvZc6kP47hZgl62M1vGnw6gHQhb1" crossorigin="anonymous" type="application/javascript"></script>
 
-<script src="https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js"></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://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js"></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>
 
-<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.min.js" integrity="sha384-IDwe1+LCz02ROU9k972gdyvl+AESN10+x7tBKgc9I5HFtuNz0wWnPclzo6p9vxnk" crossorigin="anonymous"></script>
-<script src="https://unpkg.com/bootstrap-table@1.21.1/dist/bootstrap-table.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js" integrity="sha384-IazMVNyYoUNx6357fWJoqtHYUWWCNHIXxFVtbpVgvImQNWuRP2WbHPaIb3QF8j97" crossorigin="anonymous" type="application/javascript"></script>
 
-<script src="https://unpkg.com/bootstrap-table@1.21.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous" type="application/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.min.js" integrity="sha384-cuYeSxntonz0PPNlHhBs68uyIAVpIIOZZ5JqeqvYYIcEL727kskC66kF92t6Xl2V" crossorigin="anonymous" type="application/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.22.1/dist/bootstrap-table.min.js" integrity="sha384-GVLHfbEvuGA/RFiQ3MK2ClEJkWYJXABg55t9LpoDPZFGIsSq8xhFlQydm5poV2jW" crossorigin="anonymous" type="application/javascript"></script>
 
-<script src="https://unpkg.com/bootstrap-table@1.21.1/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.21.4/dist/extensions/export/bootstrap-table-export.min.js" integrity="sha384-jeldDadm+qM2RwGER3qVqxFgWVpAEJ7Jie+0rlYj8ni3KkQA654T8TSXDtol022X" crossorigin="anonymous" type="application/javascript"></script>
+
+<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.21.4/dist/extensions/resizable/bootstrap-table-resizable.js" integrity="sha384-wd8Vc6Febikdnsnk9vthRWRvMwffw246vhqiqNO3aSNe1maTEA07Vh3zAQiSyDji" crossorigin="anonymous" type="application/javascript"></script>
+
+<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.21.4/dist/extensions/filter-control/bootstrap-table-filter-control.js" integrity="sha384-B6xNXlSOaOFxjlKo9OW3htbox+9/DcaEcjPPEi1+pTMwH5Tzc/s2wNTYriHz7Tb8" crossorigin="anonymous" type="application/javascript"></script>
 
 <script>
     async function copyToClipboard(text, button) {
@@ -38,4 +43,28 @@
             .replace(/>/g, "&gt;")
             .replace(/"/g, "&quot;");
     }
+
+    function extractDataList(data, column) {
+        const elements = data.flatMap(row => row[column].split("<br>")).filter(v => v); // remove empty elements from array
+        return Array.from(new Set(elements)).sort();
+    }
+
+    function filterContains(text, value) {
+        return value.includes(text.toLowerCase().trim());
+    }
+
+    function filterDateRange(text, value) {
+        const asOfStartOfDay = date => date.setUTCHours(0, 0, 0, 0);
+
+        const [minDate, maxDate] = text.split(" - ");
+        const buildDate = asOfStartOfDay(new Date(value));
+
+        return (buildDate >= new Date(minDate)) && (buildDate <= new Date(maxDate));
+    }
+
+    function filterList(index, value, field, data) {
+        const dataList = extractDataList(data, field);
+        // the library removes all symbols from string, so it is just string
+        return value.includes(dataList[index].toLowerCase());
+    }
 </script>

package/share/ahriman/templates/utils/style.jinja2

@@ -1,11 +1,15 @@
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous" type="text/css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.4/font/bootstrap-icons.css" integrity="sha384-LrVLJJYk9OiJmjNDakUBU7kS9qCT8wk1j2OU7ncpsfB3QS37UPdkCuq3ZD1MugNY" crossorigin="anonymous" type="text/css">
 
-<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.21.1/dist/bootstrap-table.min.css" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.21.4/dist/bootstrap-table.min.css" integrity="sha384-pTEAhytv7JmEG2D7qiW5gY0lI5EKZ9n3CNmj6Qp+U3qhnmH2qnnN9KJbVwbtMHN0" crossorigin="anonymous" type="text/css">
 
-<link rel="stylesheet" href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" integrity="sha384-1sLxvR8mXzjhvFY9f8mzXl97DNLepeZ0PnRiMMdm/rQsKjsrPZPJxYle2wwT2PMg" crossorigin="anonymous" type="text/css">
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.2.2/dist/cosmo/bootstrap.min.css" integrity="sha256-5t++JZpgVLzo9vF7snO5Qw0y3fA5/NkoJENWB7kpg0E=" crossorigin="anonymous" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.21.4/dist/extensions/filter-control/bootstrap-table-filter-control.css" integrity="sha384-4Glx18jZ0Un+yDG6KUpYJ/af8hkssJ02jRASuFv23gfCl0mTXaVMPI9cB4cn3GvE" crossorigin="anonymous" type="text/css">
+
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.2.3/dist/cosmo/bootstrap.min.css" integrity="sha384-P1PBFVifKf1Ww0gS5B8A0siIeDpcFd4uU7S68LA1XMdE0R+y1WN3DR4HcLc9csRC" crossorigin="anonymous" type="text/css">
+
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/daterangepicker@3.1.0/daterangepicker.css" integrity="sha384-zLkQsiLfAQqGeIJeKLC+rcCR1YoYaQFLCL7cLDUoKE1ajKJzySpjzWGfYS2vjSG+" crossorigin="anonymous" type="text/css">
 
 <style>
     .pre-scrollable {

package/share/bash-completion/completions/_ahriman

@@ -1,18 +1,18 @@
 # AUTOMATICALLY GENERATED by `shtab`
 
-_shtab_ahriman_subparsers=('aur-search' 'search' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'user-add' 'user-list' 'user-remove' 'web')
+_shtab_ahriman_subparsers=('aur-search' 'search' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-repositories' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'service-tree-migrate' 'user-add' 'user-list' 'user-remove' 'web')
 
-_shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--report' '--no-report' '-q' '--quiet' '--unsafe' '-V' '--version')
+_shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--log-handler' '-q' '--quiet' '--report' '--no-report' '-r' '--repository' '--unsafe' '--wait-timeout' '-V' '--version')
 _shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
 _shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
 _shtab_ahriman_help_option_strings=('-h' '--help')
-_shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help' '--command')
+_shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help')
 _shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_help_version_option_strings=('-h' '--help')
 _shtab_ahriman_version_option_strings=('-h' '--help')
-_shtab_ahriman_package_add_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source')
-_shtab_ahriman_add_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source')
-_shtab_ahriman_package_update_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source')
+_shtab_ahriman_package_add_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username')
+_shtab_ahriman_add_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username')
+_shtab_ahriman_package_update_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username')
 _shtab_ahriman_package_remove_option_strings=('-h' '--help')
 _shtab_ahriman_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
@@ -27,10 +27,12 @@ _shtab_ahriman_patch_set_add_option_strings=('-h' '--help' '-t' '--track')
 _shtab_ahriman_repo_backup_option_strings=('-h' '--help')
 _shtab_ahriman_repo_check_option_strings=('-h' '--help' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_check_option_strings=('-h' '--help' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_create_keyring_option_strings=('-h' '--help')
+_shtab_ahriman_repo_create_mirrorlist_option_strings=('-h' '--help')
 _shtab_ahriman_repo_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '-e' '--exit-code')
-_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '-e' '--exit-code')
+_shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
 _shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
 _shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
 _shtab_ahriman_repo_report_option_strings=('-h' '--help')
@@ -41,36 +43,39 @@ _shtab_ahriman_sign_option_strings=('-h' '--help')
 _shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
 _shtab_ahriman_repo_sync_option_strings=('-h' '--help')
 _shtab_ahriman_sync_option_strings=('-h' '--help')
-_shtab_ahriman_repo_tree_option_strings=('-h' '--help')
+_shtab_ahriman_repo_tree_option_strings=('-h' '--help' '-p' '--partitions')
 _shtab_ahriman_repo_triggers_option_strings=('-h' '--help')
-_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
 _shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
 _shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
-_shtab_ahriman_service_config_option_strings=('-h' '--help' '--secure' '--no-secure')
-_shtab_ahriman_config_option_strings=('-h' '--help' '--secure' '--no-secure')
-_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--secure' '--no-secure')
+_shtab_ahriman_service_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
 _shtab_ahriman_service_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
 _shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
-_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_service_repositories_option_strings=('-h' '--help' '--id-only' '--no-id-only')
+_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
 _shtab_ahriman_service_shell_option_strings=('-h' '--help')
 _shtab_ahriman_shell_option_strings=('-h' '--help')
-_shtab_ahriman_user_add_option_strings=('-h' '--help' '-p' '--password' '-r' '--role' '-s' '--secure')
-_shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-r' '--role')
+_shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
+_shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-R' '--role')
+_shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-R' '--role')
 _shtab_ahriman_user_remove_option_strings=('-h' '--help')
 _shtab_ahriman_web_option_strings=('-h' '--help')
 
 
 
-_shtab_ahriman_pos_0_choices=('aur-search' 'search' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'user-add' 'user-list' 'user-remove' 'web')
+_shtab_ahriman_pos_0_choices=('aur-search' 'search' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-repositories' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'service-tree-migrate' 'user-add' 'user-list' 'user-remove' 'web')
+_shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
 _shtab_ahriman_aur_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
 _shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
 _shtab_ahriman_package_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
@@ -87,6 +92,10 @@ _shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building'
 _shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_service_setup___sign_target_choices=('disabled' 'packages' 'repository')
@@ -94,19 +103,19 @@ _shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
 _shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
 _shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
 _shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_user_add__r_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_add__R_choices=('unauthorized' 'read' 'reporter' 'full')
 _shtab_ahriman_user_add___role_choices=('unauthorized' 'read' 'reporter' 'full')
-_shtab_ahriman_user_list__r_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list__R_choices=('unauthorized' 'read' 'reporter' 'full')
 _shtab_ahriman_user_list___role_choices=('unauthorized' 'read' 'reporter' 'full')
 
 _shtab_ahriman_pos_0_nargs=A...
 _shtab_ahriman__h_nargs=0
 _shtab_ahriman___help_nargs=0
 _shtab_ahriman___force_nargs=0
-_shtab_ahriman___report_nargs=0
-_shtab_ahriman___no_report_nargs=0
 _shtab_ahriman__q_nargs=0
 _shtab_ahriman___quiet_nargs=0
+_shtab_ahriman___report_nargs=0
+_shtab_ahriman___no_report_nargs=0
 _shtab_ahriman___unsafe_nargs=0
 _shtab_ahriman__V_nargs=0
 _shtab_ahriman___version_nargs=0
@@ -126,6 +135,7 @@ _shtab_ahriman_search___info_nargs=0
 _shtab_ahriman_search___no_info_nargs=0
 _shtab_ahriman_help__h_nargs=0
 _shtab_ahriman_help___help_nargs=0
+_shtab_ahriman_help_commands_unsafe_pos_0_nargs=*
 _shtab_ahriman_help_commands_unsafe__h_nargs=0
 _shtab_ahriman_help_commands_unsafe___help_nargs=0
 _shtab_ahriman_help_updates__h_nargs=0
@@ -143,6 +153,8 @@ _shtab_ahriman_package_add___dependencies_nargs=0
 _shtab_ahriman_package_add___no_dependencies_nargs=0
 _shtab_ahriman_package_add__e_nargs=0
 _shtab_ahriman_package_add___exit_code_nargs=0
+_shtab_ahriman_package_add___increment_nargs=0
+_shtab_ahriman_package_add___no_increment_nargs=0
 _shtab_ahriman_package_add__n_nargs=0
 _shtab_ahriman_package_add___now_nargs=0
 _shtab_ahriman_package_add__y_nargs=0
@@ -154,6 +166,8 @@ _shtab_ahriman_add___dependencies_nargs=0
 _shtab_ahriman_add___no_dependencies_nargs=0
 _shtab_ahriman_add__e_nargs=0
 _shtab_ahriman_add___exit_code_nargs=0
+_shtab_ahriman_add___increment_nargs=0
+_shtab_ahriman_add___no_increment_nargs=0
 _shtab_ahriman_add__n_nargs=0
 _shtab_ahriman_add___now_nargs=0
 _shtab_ahriman_add__y_nargs=0
@@ -165,6 +179,8 @@ _shtab_ahriman_package_update___dependencies_nargs=0
 _shtab_ahriman_package_update___no_dependencies_nargs=0
 _shtab_ahriman_package_update__e_nargs=0
 _shtab_ahriman_package_update___exit_code_nargs=0
+_shtab_ahriman_package_update___increment_nargs=0
+_shtab_ahriman_package_update___no_increment_nargs=0
 _shtab_ahriman_package_update__n_nargs=0
 _shtab_ahriman_package_update___now_nargs=0
 _shtab_ahriman_package_update__y_nargs=0
@@ -230,6 +246,10 @@ _shtab_ahriman_check___vcs_nargs=0
 _shtab_ahriman_check___no_vcs_nargs=0
 _shtab_ahriman_check__y_nargs=0
 _shtab_ahriman_check___refresh_nargs=0
+_shtab_ahriman_repo_create_keyring__h_nargs=0
+_shtab_ahriman_repo_create_keyring___help_nargs=0
+_shtab_ahriman_repo_create_mirrorlist__h_nargs=0
+_shtab_ahriman_repo_create_mirrorlist___help_nargs=0
 _shtab_ahriman_repo_daemon__h_nargs=0
 _shtab_ahriman_repo_daemon___help_nargs=0
 _shtab_ahriman_repo_daemon___aur_nargs=0
@@ -262,12 +282,16 @@ _shtab_ahriman_repo_rebuild__h_nargs=0
 _shtab_ahriman_repo_rebuild___help_nargs=0
 _shtab_ahriman_repo_rebuild___dry_run_nargs=0
 _shtab_ahriman_repo_rebuild___from_database_nargs=0
+_shtab_ahriman_repo_rebuild___increment_nargs=0
+_shtab_ahriman_repo_rebuild___no_increment_nargs=0
 _shtab_ahriman_repo_rebuild__e_nargs=0
 _shtab_ahriman_repo_rebuild___exit_code_nargs=0
 _shtab_ahriman_rebuild__h_nargs=0
 _shtab_ahriman_rebuild___help_nargs=0
 _shtab_ahriman_rebuild___dry_run_nargs=0
 _shtab_ahriman_rebuild___from_database_nargs=0
+_shtab_ahriman_rebuild___increment_nargs=0
+_shtab_ahriman_rebuild___no_increment_nargs=0
 _shtab_ahriman_rebuild__e_nargs=0
 _shtab_ahriman_rebuild___exit_code_nargs=0
 _shtab_ahriman_repo_remove_unknown__h_nargs=0
@@ -309,6 +333,8 @@ _shtab_ahriman_repo_update___no_dependencies_nargs=0
 _shtab_ahriman_repo_update___dry_run_nargs=0
 _shtab_ahriman_repo_update__e_nargs=0
 _shtab_ahriman_repo_update___exit_code_nargs=0
+_shtab_ahriman_repo_update___increment_nargs=0
+_shtab_ahriman_repo_update___no_increment_nargs=0
 _shtab_ahriman_repo_update___local_nargs=0
 _shtab_ahriman_repo_update___no_local_nargs=0
 _shtab_ahriman_repo_update___manual_nargs=0
@@ -327,6 +353,8 @@ _shtab_ahriman_update___no_dependencies_nargs=0
 _shtab_ahriman_update___dry_run_nargs=0
 _shtab_ahriman_update__e_nargs=0
 _shtab_ahriman_update___exit_code_nargs=0
+_shtab_ahriman_update___increment_nargs=0
+_shtab_ahriman_update___no_increment_nargs=0
 _shtab_ahriman_update___local_nargs=0
 _shtab_ahriman_update___no_local_nargs=0
 _shtab_ahriman_update___manual_nargs=0
@@ -373,14 +401,20 @@ _shtab_ahriman_repo_clean___pacman_nargs=0
 _shtab_ahriman_repo_clean___no_pacman_nargs=0
 _shtab_ahriman_service_config__h_nargs=0
 _shtab_ahriman_service_config___help_nargs=0
+_shtab_ahriman_service_config___info_nargs=0
+_shtab_ahriman_service_config___no_info_nargs=0
 _shtab_ahriman_service_config___secure_nargs=0
 _shtab_ahriman_service_config___no_secure_nargs=0
 _shtab_ahriman_config__h_nargs=0
 _shtab_ahriman_config___help_nargs=0
+_shtab_ahriman_config___info_nargs=0
+_shtab_ahriman_config___no_info_nargs=0
 _shtab_ahriman_config___secure_nargs=0
 _shtab_ahriman_config___no_secure_nargs=0
 _shtab_ahriman_repo_config__h_nargs=0
 _shtab_ahriman_repo_config___help_nargs=0
+_shtab_ahriman_repo_config___info_nargs=0
+_shtab_ahriman_repo_config___no_info_nargs=0
 _shtab_ahriman_repo_config___secure_nargs=0
 _shtab_ahriman_repo_config___no_secure_nargs=0
 _shtab_ahriman_service_config_validate__h_nargs=0
@@ -399,32 +433,46 @@ _shtab_ahriman_service_key_import__h_nargs=0
 _shtab_ahriman_service_key_import___help_nargs=0
 _shtab_ahriman_key_import__h_nargs=0
 _shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_service_repositories__h_nargs=0
+_shtab_ahriman_service_repositories___help_nargs=0
+_shtab_ahriman_service_repositories___id_only_nargs=0
+_shtab_ahriman_service_repositories___no_id_only_nargs=0
 _shtab_ahriman_service_setup__h_nargs=0
 _shtab_ahriman_service_setup___help_nargs=0
+_shtab_ahriman_service_setup___generate_salt_nargs=0
+_shtab_ahriman_service_setup___no_generate_salt_nargs=0
 _shtab_ahriman_service_setup___makeflags_jobs_nargs=0
 _shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0
 _shtab_ahriman_service_setup___multilib_nargs=0
 _shtab_ahriman_service_setup___no_multilib_nargs=0
 _shtab_ahriman_init__h_nargs=0
 _shtab_ahriman_init___help_nargs=0
+_shtab_ahriman_init___generate_salt_nargs=0
+_shtab_ahriman_init___no_generate_salt_nargs=0
 _shtab_ahriman_init___makeflags_jobs_nargs=0
 _shtab_ahriman_init___no_makeflags_jobs_nargs=0
 _shtab_ahriman_init___multilib_nargs=0
 _shtab_ahriman_init___no_multilib_nargs=0
 _shtab_ahriman_repo_init__h_nargs=0
 _shtab_ahriman_repo_init___help_nargs=0
+_shtab_ahriman_repo_init___generate_salt_nargs=0
+_shtab_ahriman_repo_init___no_generate_salt_nargs=0
 _shtab_ahriman_repo_init___makeflags_jobs_nargs=0
 _shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0
 _shtab_ahriman_repo_init___multilib_nargs=0
 _shtab_ahriman_repo_init___no_multilib_nargs=0
 _shtab_ahriman_repo_setup__h_nargs=0
 _shtab_ahriman_repo_setup___help_nargs=0
+_shtab_ahriman_repo_setup___generate_salt_nargs=0
+_shtab_ahriman_repo_setup___no_generate_salt_nargs=0
 _shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___multilib_nargs=0
 _shtab_ahriman_repo_setup___no_multilib_nargs=0
 _shtab_ahriman_setup__h_nargs=0
 _shtab_ahriman_setup___help_nargs=0
+_shtab_ahriman_setup___generate_salt_nargs=0
+_shtab_ahriman_setup___no_generate_salt_nargs=0
 _shtab_ahriman_setup___makeflags_jobs_nargs=0
 _shtab_ahriman_setup___no_makeflags_jobs_nargs=0
 _shtab_ahriman_setup___multilib_nargs=0
@@ -437,10 +485,10 @@ _shtab_ahriman_shell__h_nargs=0
 _shtab_ahriman_shell___help_nargs=0
 _shtab_ahriman_shell__v_nargs=0
 _shtab_ahriman_shell___verbose_nargs=0
+_shtab_ahriman_service_tree_migrate__h_nargs=0
+_shtab_ahriman_service_tree_migrate___help_nargs=0
 _shtab_ahriman_user_add__h_nargs=0
 _shtab_ahriman_user_add___help_nargs=0
-_shtab_ahriman_user_add__s_nargs=0
-_shtab_ahriman_user_add___secure_nargs=0
 _shtab_ahriman_user_list__h_nargs=0
 _shtab_ahriman_user_list___help_nargs=0
 _shtab_ahriman_user_list__e_nargs=0
@@ -469,7 +517,7 @@ _shtab_replace_nonword() {
 # set default values (called for the initial parser & any subparsers)
 _set_parser_defaults() {
   local subparsers_var="${prefix}_subparsers[@]"
-  sub_parsers=${!subparsers_var}
+  sub_parsers=${!subparsers_var-}
 
   local current_option_strings_var="${prefix}_option_strings[@]"
   current_option_strings=${!current_option_strings_var}
@@ -486,13 +534,13 @@ _set_new_action() {
   current_action="${prefix}_$(_shtab_replace_nonword $1)"
 
   local current_action_compgen_var=${current_action}_COMPGEN
-  current_action_compgen="${!current_action_compgen_var}"
+  current_action_compgen="${!current_action_compgen_var-}"
 
   local current_action_choices_var="${current_action}_choices[@]"
-  current_action_choices="${!current_action_choices_var}"
+  current_action_choices="${!current_action_choices_var-}"
 
   local current_action_nargs_var="${current_action}_nargs"
-  if [ -n "${!current_action_nargs_var}" ]; then
+  if [ -n "${!current_action_nargs_var-}" ]; then
     current_action_nargs="${!current_action_nargs_var}"
   else
     current_action_nargs=1
@@ -514,8 +562,8 @@ _shtab_ahriman() {
   local completing_word="${COMP_WORDS[COMP_CWORD]}"
   COMPREPLY=()
 
-  prefix=_shtab_ahriman
-  word_index=0
+  local prefix=_shtab_ahriman
+  local word_index=0
   _set_parser_defaults
   word_index=1
 
@@ -524,13 +572,13 @@ _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
+    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
+    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

package/share/man/man1/ahriman.1

@@ -1,16 +1,16 @@
-.TH AHRIMAN "1" "2023\-04\-09" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2023\-10\-09" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .SH SYNOPSIS
 .B ahriman
-[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--report | --no-report] [-q] [--unsafe] [-V] {aur-search,search,help,help-commands-unsafe,help-updates,help-version,version,package-add,add,package-update,package-remove,remove,package-status,status,package-status-remove,package-status-update,status-update,patch-add,patch-list,patch-remove,patch-set-add,repo-backup,repo-check,check,repo-daemon,daemon,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-sign,sign,repo-status-update,repo-sync,sync,repo-tree,repo-triggers,repo-update,update,service-clean,clean,repo-clean,service-config,config,repo-config,service-config-validate,config-validate,repo-config-validate,service-key-import,key-import,service-setup,init,repo-init,repo-setup,setup,service-shell,shell,user-add,user-list,user-remove,web} ...
+[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [--wait-timeout WAIT_TIMEOUT] [-V] {aur-search,search,help,help-commands-unsafe,help-updates,help-version,version,package-add,add,package-update,package-remove,remove,package-status,status,package-status-remove,package-status-update,status-update,patch-add,patch-list,patch-remove,patch-set-add,repo-backup,repo-check,check,repo-create-keyring,repo-create-mirrorlist,repo-daemon,daemon,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-sign,sign,repo-status-update,repo-sync,sync,repo-tree,repo-triggers,repo-update,update,service-clean,clean,repo-clean,service-config,config,repo-config,service-config-validate,config-validate,repo-config-validate,service-key-import,key-import,service-repositories,service-setup,init,repo-init,repo-setup,setup,service-shell,shell,service-tree-migrate,user-add,user-list,user-remove,web} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager
 
 .SH OPTIONS
 .TP
 \fB\-a\fR \fI\,ARCHITECTURE\/\fR, \fB\-\-architecture\fR \fI\,ARCHITECTURE\/\fR
-target architectures. For several subcommands it can be used multiple times
+filter by target architecture
 
 .TP
 \fB\-c\fR \fI\,CONFIGURATION\/\fR, \fB\-\-configuration\fR \fI\,CONFIGURATION\/\fR
@@ -25,17 +25,30 @@ force run, remove file lock
 lock file
 
 .TP
-\fB\-\-report\fR, \fB\-\-no\-report\fR
-force enable or disable reporting to web service (default: True)
+\fB\-\-log\-handler\fR \fI\,{console,syslog,journald}\/\fR
+explicit log handler specification. If none set, the handler will be guessed from environment
 
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
 force disable any logging
 
+.TP
+\fB\-\-report\fR, \fB\-\-no\-report\fR
+force enable or disable reporting to web service
+
+.TP
+\fB\-r\fR \fI\,REPOSITORY\/\fR, \fB\-\-repository\fR \fI\,REPOSITORY\/\fR
+filter by target repository
+
 .TP
 \fB\-\-unsafe\fR
 allow to run ahriman as non\-ahriman user. Some actions might be unavailable
 
+.TP
+\fB\-\-wait\-timeout\fR \fI\,WAIT_TIMEOUT\/\fR
+wait for lock to be free. Negative value will lead to immediate application run even if there is lock file. In case of
+zero value, the application will wait infinitely
+
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 show program's version number and exit
@@ -91,6 +104,12 @@ backup repository data
 \fBahriman\fR \fI\,repo\-check\/\fR
 check for updates
 .TP
+\fBahriman\fR \fI\,repo\-create\-keyring\/\fR
+create keyring package
+.TP
+\fBahriman\fR \fI\,repo\-create\-mirrorlist\/\fR
+create mirrorlist package
+.TP
 \fBahriman\fR \fI\,repo\-daemon\/\fR
 run application as daemon
 .TP
@@ -136,12 +155,18 @@ validate system configuration
 \fBahriman\fR \fI\,service\-key\-import\/\fR
 import PGP key
 .TP
+\fBahriman\fR \fI\,service\-repositories\/\fR
+show repositories
+.TP
 \fBahriman\fR \fI\,service\-setup\/\fR
 initial service configuration
 .TP
 \fBahriman\fR \fI\,service\-shell\/\fR
 invoke python shell
 .TP
+\fBahriman\fR \fI\,service\-tree\-migrate\/\fR
+migrate repository tree
+.TP
 \fBahriman\fR \fI\,user\-add\/\fR
 create or update user
 .TP
@@ -172,7 +197,7 @@ return non\-zero exit status if result is empty
 
 .TP
 \fB\-\-info\fR, \fB\-\-no\-info\fR
-show additional package information (default: False)
+show additional package information
 
 .TP
 \fB\-\-sort\-by\fR \fI\,{description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}\/\fR
@@ -189,13 +214,12 @@ show help message for application or command and exit
 show help message for specific command
 
 .SH COMMAND \fI\,'ahriman help\-commands\-unsafe'\/\fR
-usage: ahriman help\-commands\-unsafe [\-h] [\-\-command COMMAND]
+usage: ahriman help\-commands\-unsafe [\-h] [command ...]
 
 list unsafe commands as defined in default args
 
-.SH OPTIONS \fI\,'ahriman help\-commands\-unsafe'\/\fR
 .TP
-\fB\-\-command\fR \fI\,COMMAND\/\fR
+\fBcommand\fR
 instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1
 otherwise
 
@@ -215,8 +239,8 @@ usage: ahriman help\-version [\-h]
 print application and its dependencies versions
 
 .SH COMMAND \fI\,'ahriman package\-add'\/\fR
-usage: ahriman package\-add [\-h] [\-\-dependencies | \-\-no\-dependencies] [\-e] [\-n] [\-y]
-                           [\-s {auto,archive,aur,directory,local,remote,repository}]
+usage: ahriman package\-add [\-h] [\-\-dependencies | \-\-no\-dependencies] [\-e] [\-\-increment | \-\-no\-increment] [\-n] [\-y]
+                           [\-s {auto,archive,aur,directory,local,remote,repository}] [\-u USERNAME]
                            package [package ...]
 
 add existing or new package to the build queue
@@ -228,12 +252,16 @@ package source (base name, path to local files, remote URL)
 .SH OPTIONS \fI\,'ahriman package\-add'\/\fR
 .TP
 \fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
-process missing package dependencies (default: True)
+process missing package dependencies
 
 .TP
 \fB\-e\fR, \fB\-\-exit\-code\fR
 return non\-zero exit status if result is empty
 
+.TP
+\fB\-\-increment\fR, \fB\-\-no\-increment\fR
+increment package release (pkgrel) version on duplicate
+
 .TP
 \fB\-n\fR, \fB\-\-now\fR
 run update function after
@@ -246,6 +274,10 @@ download fresh package databases from the mirror before actions, \-yy to force r
 \fB\-s\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR, \fB\-\-source\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR
 explicitly specify the package source for this command
 
+.TP
+\fB\-u\fR \fI\,USERNAME\/\fR, \fB\-\-username\fR \fI\,USERNAME\/\fR
+build as user
+
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
 usage: ahriman package\-remove [\-h] package [package ...]
 
@@ -276,7 +308,7 @@ return non\-zero exit status if result is empty
 
 .TP
 \fB\-\-info\fR, \fB\-\-no\-info\fR
-show additional package information (default: False)
+show additional package information
 
 .TP
 \fB\-s\fR \fI\,{unknown,pending,building,failed,success}\/\fR, \fB\-\-status\fR \fI\,{unknown,pending,building,failed,success}\/\fR
@@ -394,12 +426,22 @@ return non\-zero exit status if result is empty
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-fetch actual version of VCS packages (default: True)
+fetch actual version of VCS packages
 
 .TP
 \fB\-y\fR, \fB\-\-refresh\fR
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
+.SH COMMAND \fI\,'ahriman repo\-create\-keyring'\/\fR
+usage: ahriman repo\-create\-keyring [\-h]
+
+create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually
+
+.SH COMMAND \fI\,'ahriman repo\-create\-mirrorlist'\/\fR
+usage: ahriman repo\-create\-mirrorlist [\-h]
+
+create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually
+
 .SH COMMAND \fI\,'ahriman repo\-daemon'\/\fR
 usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-dependencies | \-\-no\-dependencies]
                            [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-\-vcs | \-\-no\-vcs] [\-y]
@@ -413,30 +455,31 @@ interval between runs in seconds
 
 .TP
 \fB\-\-aur\fR, \fB\-\-no\-aur\fR
-enable or disable checking for AUR updates (default: True)
+enable or disable checking for AUR updates
 
 .TP
 \fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
-process missing package dependencies (default: True)
+process missing package dependencies
 
 .TP
 \fB\-\-local\fR, \fB\-\-no\-local\fR
-enable or disable checking of local packages for updates (default: True)
+enable or disable checking of local packages for updates
 
 .TP
 \fB\-\-manual\fR, \fB\-\-no\-manual\fR
-include or exclude manual updates (default: True)
+include or exclude manual updates
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-fetch actual version of VCS packages (default: True)
+fetch actual version of VCS packages
 
 .TP
 \fB\-y\fR, \fB\-\-refresh\fR
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
 .SH COMMAND \fI\,'ahriman repo\-rebuild'\/\fR
-usage: ahriman repo\-rebuild [\-h] [\-\-depends\-on DEPENDS_ON] [\-\-dry\-run] [\-\-from\-database] [\-e]
+usage: ahriman repo\-rebuild [\-h] [\-\-depends\-on DEPENDS_ON] [\-\-dry\-run] [\-\-from\-database] [\-\-increment | \-\-no\-increment]
+                            [\-e] [\-s {unknown,pending,building,failed,success}] [\-u USERNAME]
 
 force rebuild whole repository
 
@@ -455,10 +498,22 @@ read packages from database instead of filesystem. This feature in particular is
 restore repository from another repository instance. Note, however, that in order to restore packages you need to have
 original ahriman instance run with web service and have run repo\-update at least once.
 
+.TP
+\fB\-\-increment\fR, \fB\-\-no\-increment\fR
+increment package release (pkgrel) on duplicate
+
 .TP
 \fB\-e\fR, \fB\-\-exit\-code\fR
 return non\-zero exit status if result is empty
 
+.TP
+\fB\-s\fR \fI\,{unknown,pending,building,failed,success}\/\fR, \fB\-\-status\fR \fI\,{unknown,pending,building,failed,success}\/\fR
+filter packages by status. Requires \-\-from\-database to be set
+
+.TP
+\fB\-u\fR \fI\,USERNAME\/\fR, \fB\-\-username\fR \fI\,USERNAME\/\fR
+build as user
+
 .SH COMMAND \fI\,'ahriman repo\-remove\-unknown'\/\fR
 usage: ahriman repo\-remove\-unknown [\-h] [\-\-dry\-run]
 
@@ -513,10 +568,15 @@ usage: ahriman repo\-sync [\-h]
 sync repository files to remote server according to current settings
 
 .SH COMMAND \fI\,'ahriman repo\-tree'\/\fR
-usage: ahriman repo\-tree [\-h]
+usage: ahriman repo\-tree [\-h] [\-p PARTITIONS]
 
 dump repository tree based on packages dependencies
 
+.SH OPTIONS \fI\,'ahriman repo\-tree'\/\fR
+.TP
+\fB\-p\fR \fI\,PARTITIONS\/\fR, \fB\-\-partitions\fR \fI\,PARTITIONS\/\fR
+also divide packages by independent partitions
+
 .SH COMMAND \fI\,'ahriman repo\-triggers'\/\fR
 usage: ahriman repo\-triggers [\-h] [trigger ...]
 
@@ -528,7 +588,8 @@ instead of running all triggers as set by configuration, just process specified
 
 .SH COMMAND \fI\,'ahriman repo\-update'\/\fR
 usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e]
-                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-\-vcs | \-\-no\-vcs] [\-y]
+                           [\-\-increment | \-\-no\-increment] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-u USERNAME]
+                           [\-\-vcs | \-\-no\-vcs] [\-y]
                            [package ...]
 
 check for packages updates and run build process if requested
@@ -540,11 +601,11 @@ filter check by package base
 .SH OPTIONS \fI\,'ahriman repo\-update'\/\fR
 .TP
 \fB\-\-aur\fR, \fB\-\-no\-aur\fR
-enable or disable checking for AUR updates (default: True)
+enable or disable checking for AUR updates
 
 .TP
 \fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
-process missing package dependencies (default: True)
+process missing package dependencies
 
 .TP
 \fB\-\-dry\-run\fR
@@ -554,17 +615,25 @@ just perform check for updates, same as check command
 \fB\-e\fR, \fB\-\-exit\-code\fR
 return non\-zero exit status if result is empty
 
+.TP
+\fB\-\-increment\fR, \fB\-\-no\-increment\fR
+increment package release (pkgrel) on duplicate
+
 .TP
 \fB\-\-local\fR, \fB\-\-no\-local\fR
-enable or disable checking of local packages for updates (default: True)
+enable or disable checking of local packages for updates
 
 .TP
 \fB\-\-manual\fR, \fB\-\-no\-manual\fR
-include or exclude manual updates (default: True)
+include or exclude manual updates
+
+.TP
+\fB\-u\fR \fI\,USERNAME\/\fR, \fB\-\-username\fR \fI\,USERNAME\/\fR
+build as user
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-fetch actual version of VCS packages (default: True)
+fetch actual version of VCS packages
 
 .TP
 \fB\-y\fR, \fB\-\-refresh\fR
@@ -579,33 +648,45 @@ remove local caches
 .SH OPTIONS \fI\,'ahriman service\-clean'\/\fR
 .TP
 \fB\-\-cache\fR, \fB\-\-no\-cache\fR
-clear directory with package caches (default: False)
+clear directory with package caches
 
 .TP
 \fB\-\-chroot\fR, \fB\-\-no\-chroot\fR
-clear build chroot (default: False)
+clear build chroot
 
 .TP
 \fB\-\-manual\fR, \fB\-\-no\-manual\fR
-clear manually added packages queue (default: False)
+clear manually added packages queue
 
 .TP
 \fB\-\-packages\fR, \fB\-\-no\-packages\fR
-clear directory with built packages (default: False)
+clear directory with built packages
 
 .TP
 \fB\-\-pacman\fR, \fB\-\-no\-pacman\fR
-clear directory with pacman local database cache (default: False)
+clear directory with pacman local database cache
 
 .SH COMMAND \fI\,'ahriman service\-config'\/\fR
-usage: ahriman service\-config [\-h] [\-\-secure | \-\-no\-secure]
+usage: ahriman service\-config [\-h] [\-\-info | \-\-no\-info] [\-\-secure | \-\-no\-secure] [section] [key]
 
 dump configuration for the specified architecture
 
+.TP
+\fBsection\fR
+filter settings by section
+
+.TP
+\fBkey\fR
+filter settings by key
+
 .SH OPTIONS \fI\,'ahriman service\-config'\/\fR
+.TP
+\fB\-\-info\fR, \fB\-\-no\-info\fR
+show additional information, e.g. configuration files
+
 .TP
 \fB\-\-secure\fR, \fB\-\-no\-secure\fR
-hide passwords and secrets from output (default: True)
+hide passwords and secrets from output
 
 .SH COMMAND \fI\,'ahriman service\-config\-validate'\/\fR
 usage: ahriman service\-config\-validate [\-h] [\-e]
@@ -631,10 +712,20 @@ PGP key to import from public server
 \fB\-\-key\-server\fR \fI\,KEY_SERVER\/\fR
 key server for key import
 
+.SH COMMAND \fI\,'ahriman service\-repositories'\/\fR
+usage: ahriman service\-repositories [\-h] [\-\-id\-only | \-\-no\-id\-only]
+
+list all available repositories
+
+.SH OPTIONS \fI\,'ahriman service\-repositories'\/\fR
+.TP
+\fB\-\-id\-only\fR, \fB\-\-no\-id\-only\fR
+show machine readable identifier instead
+
 .SH COMMAND \fI\,'ahriman service\-setup'\/\fR
-usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-build\-command BUILD_COMMAND]
-                             [\-\-from\-configuration FROM_CONFIGURATION] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
-                             [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER \-\-repository REPOSITORY
+usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-from\-configuration FROM_CONFIGURATION]
+                             [\-\-generate\-salt | \-\-no\-generate\-salt] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
+                             [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER [\-\-server SERVER]
                              [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
                              [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
 
@@ -645,17 +736,17 @@ create initial service configuration, requires root
 \fB\-\-build\-as\-user\fR \fI\,BUILD_AS_USER\/\fR
 force makepkg user to the specific one
 
-.TP
-\fB\-\-build\-command\fR \fI\,BUILD_COMMAND\/\fR
-build command prefix
-
 .TP
 \fB\-\-from\-configuration\fR \fI\,FROM_CONFIGURATION\/\fR
 path to default devtools pacman configuration
 
+.TP
+\fB\-\-generate\-salt\fR, \fB\-\-no\-generate\-salt\fR
+generate salt for user passwords
+
 .TP
 \fB\-\-makeflags\-jobs\fR, \fB\-\-no\-makeflags\-jobs\fR
-append MAKEFLAGS variable with parallelism set to number of cores (default: True)
+append MAKEFLAGS variable with parallelism set to number of cores
 
 .TP
 \fB\-\-mirror\fR \fI\,MIRROR\/\fR
@@ -663,15 +754,15 @@ use the specified explicitly mirror instead of including mirrorlist
 
 .TP
 \fB\-\-multilib\fR, \fB\-\-no\-multilib\fR
-add or do not multilib repository (default: True)
+add or do not multilib repository
 
 .TP
 \fB\-\-packager\fR \fI\,PACKAGER\/\fR
 packager name and email
 
 .TP
-\fB\-\-repository\fR \fI\,REPOSITORY\/\fR
-repository name
+\fB\-\-server\fR \fI\,SERVER\/\fR
+server to be used for devtools. If none set, local files will be used
 
 .TP
 \fB\-\-sign\-key\fR \fI\,SIGN_KEY\/\fR
@@ -692,14 +783,20 @@ path to unix socket used for interprocess communications
 .SH COMMAND \fI\,'ahriman service\-shell'\/\fR
 usage: ahriman service\-shell [\-h] [code]
 
-drop into python shell while having created application
+drop into python shell
 
 .TP
 \fBcode\fR
 instead of dropping into shell, just execute the specified code
 
+.SH COMMAND \fI\,'ahriman service\-tree\-migrate'\/\fR
+usage: ahriman service\-tree\-migrate [\-h]
+
+migrate repository tree between versions
+
 .SH COMMAND \fI\,'ahriman user\-add'\/\fR
-usage: ahriman user\-add [\-h] [\-p PASSWORD] [\-r {unauthorized,read,reporter,full}] [\-s] username
+usage: ahriman user\-add [\-h] [\-\-key KEY] [\-\-packager PACKAGER] [\-p PASSWORD] [\-R {unauthorized,read,reporter,full}]
+                        username
 
 update user for web services with the given password and role. In case if password was not entered it will be asked interactively
 
@@ -708,21 +805,25 @@ update user for web services with the given password and role. In case if passwo
 username for web service
 
 .SH OPTIONS \fI\,'ahriman user\-add'\/\fR
+.TP
+\fB\-\-key\fR \fI\,KEY\/\fR
+optional PGP key used by this user. The private key must be imported
+
+.TP
+\fB\-\-packager\fR \fI\,PACKAGER\/\fR
+optional packager id used for build process in form of `Name Surname <mail@example.com>`
+
 .TP
 \fB\-p\fR \fI\,PASSWORD\/\fR, \fB\-\-password\fR \fI\,PASSWORD\/\fR
 user password. Blank password will be treated as empty password, which is in particular must be used for OAuth2
 authorization type.
 
 .TP
-\fB\-r\fR \fI\,{unauthorized,read,reporter,full}\/\fR, \fB\-\-role\fR \fI\,{unauthorized,read,reporter,full}\/\fR
+\fB\-R\fR \fI\,{unauthorized,read,reporter,full}\/\fR, \fB\-\-role\fR \fI\,{unauthorized,read,reporter,full}\/\fR
 user access level
 
-.TP
-\fB\-s\fR, \fB\-\-secure\fR
-set file permissions to user\-only
-
 .SH COMMAND \fI\,'ahriman user\-list'\/\fR
-usage: ahriman user\-list [\-h] [\-e] [\-r {unauthorized,read,reporter,full}] [username]
+usage: ahriman user\-list [\-h] [\-e] [\-R {unauthorized,read,reporter,full}] [username]
 
 list users from the user mapping and their roles
 
@@ -736,7 +837,7 @@ filter users by username
 return non\-zero exit status if result is empty
 
 .TP
-\fB\-r\fR \fI\,{unauthorized,read,reporter,full}\/\fR, \fB\-\-role\fR \fI\,{unauthorized,read,reporter,full}\/\fR
+\fB\-R\fR \fI\,{unauthorized,read,reporter,full}\/\fR, \fB\-\-role\fR \fI\,{unauthorized,read,reporter,full}\/\fR
 filter users by role
 
 .SH COMMAND \fI\,'ahriman user\-remove'\/\fR
@@ -756,7 +857,7 @@ start web server
 .SH COMMENTS
 Argument list can also be read from file by using @ prefix.
 
-.SH AUTHORS
+.SH AUTHOR
 .nf
 ahriman team
 .fi

package/share/zsh/site-functions/_ahriman

@@ -0,0 +1,693 @@
+#compdef ahriman
+
+# AUTOMATICALLY GENERATED by `shtab`
+
+
+_shtab_ahriman_commands() {
+  local _commands=(
+    "add:add existing or new package to the build queue"
+    "aur-search:search for package in AUR using API"
+    "check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    "clean:remove local caches"
+    "config:dump configuration for the specified architecture"
+    "config-validate:validate configuration and print found errors"
+    "daemon:start process which periodically will run update process"
+    "help:show help message for application or command and exit"
+    "help-commands-unsafe:list unsafe commands as defined in default args"
+    "help-updates:request AUR for current version and compare with current service version"
+    "help-version:print application and its dependencies versions"
+    "init:create initial service configuration, requires root"
+    "key-import:import PGP key from public sources to the repository user"
+    "package-add:add existing or new package to the build queue"
+    "package-remove:remove package from the repository"
+    "package-status:request status of the package"
+    "package-status-remove:remove the package from the status page"
+    "package-status-update:update package status on the status page"
+    "package-update:add existing or new package to the build queue"
+    "patch-add:create or update patched PKGBUILD function or variable"
+    "patch-list:list available patches for the package"
+    "patch-remove:remove patches for the package"
+    "patch-set-add:create or update source patches"
+    "rebuild:force rebuild whole repository"
+    "remove:remove package from the repository"
+    "remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    "repo-backup:backup repository settings and database"
+    "repo-check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    "repo-clean:remove local caches"
+    "repo-config:dump configuration for the specified architecture"
+    "repo-config-validate:validate configuration and print found errors"
+    "repo-create-keyring:create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually"
+    "repo-create-mirrorlist:create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually"
+    "repo-daemon:start process which periodically will run update process"
+    "repo-init:create initial service configuration, requires root"
+    "repo-rebuild:force rebuild whole repository"
+    "repo-remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    "repo-report:generate repository report according to current settings"
+    "repo-restore:restore settings and database"
+    "repo-setup:create initial service configuration, requires root"
+    "repo-sign:(re-)sign packages and repository database according to current settings"
+    "repo-status-update:update repository status on the status page"
+    "repo-sync:sync repository files to remote server according to current settings"
+    "repo-tree:dump repository tree based on packages dependencies"
+    "repo-triggers:run triggers on empty build result as configured by settings"
+    "repo-update:check for packages updates and run build process if requested"
+    "report:generate repository report according to current settings"
+    "search:search for package in AUR using API"
+    "service-clean:remove local caches"
+    "service-config:dump configuration for the specified architecture"
+    "service-config-validate:validate configuration and print found errors"
+    "service-key-import:import PGP key from public sources to the repository user"
+    "service-repositories:list all available repositories"
+    "service-setup:create initial service configuration, requires root"
+    "service-shell:drop into python shell"
+    "service-tree-migrate:migrate repository tree between versions"
+    "setup:create initial service configuration, requires root"
+    "shell:drop into python shell"
+    "sign:(re-)sign packages and repository database according to current settings"
+    "status:request status of the package"
+    "status-update:update package status on the status page"
+    "sync:sync repository files to remote server according to current settings"
+    "update:check for packages updates and run build process if requested"
+    "user-add:update user for web services with the given password and role. In case if password was not entered it will be asked interactively"
+    "user-list:list users from the user mapping and their roles"
+    "user-remove:remove user from the user mapping and update the configuration"
+    "version:print application and its dependencies versions"
+    "web:start web server"
+  )
+  _describe 'ahriman commands' _commands
+}
+
+_shtab_ahriman_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-a,--architecture}"[filter by target architecture (default\: None)]:architecture:"
+  {-c,--configuration}"[configuration path (default\: \/etc\/ahriman.ini)]:configuration:"
+  "--force[force run, remove file lock (default\: False)]"
+  {-l,--lock}"[lock file (default\: \/tmp\/ahriman.lock)]:lock:"
+  "--log-handler[explicit log handler specification. If none set, the handler will be guessed from environment (default\: None)]:log_handler:(console syslog journald)"
+  {-q,--quiet}"[force disable any logging (default\: False)]"
+  {--report,--no-report}"[force enable or disable reporting to web service (default\: True)]:report:"
+  {-r,--repository}"[filter by target repository (default\: None)]:repository:"
+  "--unsafe[allow to run ahriman as non-ahriman user. Some actions might be unavailable (default\: False)]"
+  "--wait-timeout[wait for lock to be free. Negative value will lead to immediate application run even if there is lock file. In case of zero value, the application will wait infinitely (default\: -1)]:wait_timeout:"
+  "(- : *)"{-V,--version}"[show program\'s version number and exit]"
+)
+
+_shtab_ahriman_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
+  {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  {-s,--source}"[explicitly specify the package source for this command (default\: PackageSource.Auto)]:source:(auto archive aur directory local remote repository)"
+  {-u,--username}"[build as user (default\: None)]:username:"
+  "(*):package source (base name, path to local files, remote URL):"
+)
+
+_shtab_ahriman_aur_search_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name (default\: name)]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
+  "(*):search terms, can be specified multiple times, the result will match all terms:"
+)
+
+_shtab_ahriman_check_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  "(*)::filter check by package base (default\: None):"
+)
+
+_shtab_ahriman_clean_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
+)
+
+_shtab_ahriman_config_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
+  ":filter settings by section (default\: None):"
+  ":filter settings by key (default\: None):"
+)
+
+_shtab_ahriman_config_validate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
+)
+
+_shtab_ahriman_daemon_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+)
+
+_shtab_ahriman_help_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":show help message for specific command (default\: None):"
+)
+
+_shtab_ahriman_help_commands_unsafe_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1 otherwise (default\: None):"
+)
+
+_shtab_ahriman_help_updates_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit code if updates available (default\: False)]"
+)
+
+_shtab_ahriman_help_version_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_init_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
+  "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  "--packager[packager name and email (default\: None)]:packager:"
+  "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
+  "--sign-key[sign key id (default\: None)]:sign_key:"
+  "*--sign-target[sign options (default\: None)]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service (default\: None)]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
+)
+
+_shtab_ahriman_key_import_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--key-server[key server for key import (default\: keyserver.ubuntu.com)]:key_server:"
+  ":PGP key to import from public server:"
+)
+
+_shtab_ahriman_package_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
+  {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  {-s,--source}"[explicitly specify the package source for this command (default\: PackageSource.Auto)]:source:(auto archive aur directory local remote repository)"
+  {-u,--username}"[build as user (default\: None)]:username:"
+  "(*):package source (base name, path to local files, remote URL):"
+)
+
+_shtab_ahriman_package_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*):package name or base:"
+)
+
+_shtab_ahriman_package_status_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--ahriman[get service status itself (default\: False)]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {-s,--status}"[filter packages by status (default\: None)]:status:(unknown pending building failed success)"
+  "(*)::filter status by package base (default\: None):"
+)
+
+_shtab_ahriman_package_status_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*):remove specified packages from status page:"
+)
+
+_shtab_ahriman_package_status_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-s,--status}"[new package build status (default\: BuildStatusEnum.Success)]:status:(unknown pending building failed success)"
+  "(*)::set status for specified packages. If no packages supplied, service status will be updated (default\: None):"
+)
+
+_shtab_ahriman_package_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
+  {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  {-s,--source}"[explicitly specify the package source for this command (default\: PackageSource.Auto)]:source:(auto archive aur directory local remote repository)"
+  {-u,--username}"[build as user (default\: None)]:username:"
+  "(*):package source (base name, path to local files, remote URL):"
+)
+
+_shtab_ahriman_patch_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":package base:"
+  ":PKGBUILD variable or function name. If variable is a function, it must end with ():"
+  ":path to file which contains function or variable value. If not set, the value will be read from stdin (default\: None):"
+)
+
+_shtab_ahriman_patch_list_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  "*"{-v,--variable}"[if set, show only patches for specified PKGBUILD variables (default\: None)]:variable:"
+  ":package base (default\: None):"
+)
+
+_shtab_ahriman_patch_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*"{-v,--variable}"[should be used for single-function patches in case if you wold like to remove only specified PKGBUILD variables. In case if not set, it will remove all patches related to the package (default\: None)]:variable:"
+  ":package base:"
+)
+
+_shtab_ahriman_patch_set_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*"{-t,--track}"[files which has to be tracked (default\: \[\'\*.diff\', \'\*.patch\'\])]:track:"
+  ":path to directory with changed files for patch addition\/update:"
+)
+
+_shtab_ahriman_rebuild_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
+  "--dry-run[just perform check for packages without rebuild process itself (default\: False)]"
+  "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once. (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {-s,--status}"[filter packages by status. Requires --from-database to be set (default\: None)]:status:(unknown pending building failed success)"
+  {-u,--username}"[build as user (default\: None)]:username:"
+)
+
+_shtab_ahriman_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*):package name or base:"
+)
+
+_shtab_ahriman_remove_unknown_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--dry-run[just perform check for packages without removal (default\: False)]"
+)
+
+_shtab_ahriman_repo_backup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":path of the output archive:"
+)
+
+_shtab_ahriman_repo_check_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  "(*)::filter check by package base (default\: None):"
+)
+
+_shtab_ahriman_repo_clean_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
+)
+
+_shtab_ahriman_repo_config_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
+  ":filter settings by section (default\: None):"
+  ":filter settings by key (default\: None):"
+)
+
+_shtab_ahriman_repo_config_validate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
+)
+
+_shtab_ahriman_repo_create_keyring_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_create_mirrorlist_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_daemon_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+)
+
+_shtab_ahriman_repo_init_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
+  "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  "--packager[packager name and email (default\: None)]:packager:"
+  "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
+  "--sign-key[sign key id (default\: None)]:sign_key:"
+  "*--sign-target[sign options (default\: None)]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service (default\: None)]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
+)
+
+_shtab_ahriman_repo_rebuild_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
+  "--dry-run[just perform check for packages without rebuild process itself (default\: False)]"
+  "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once. (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {-s,--status}"[filter packages by status. Requires --from-database to be set (default\: None)]:status:(unknown pending building failed success)"
+  {-u,--username}"[build as user (default\: None)]:username:"
+)
+
+_shtab_ahriman_repo_remove_unknown_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--dry-run[just perform check for packages without removal (default\: False)]"
+)
+
+_shtab_ahriman_repo_report_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_restore_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-o,--output}"[root path of the extracted files (default\: \/)]:output:"
+  ":path of the input archive:"
+)
+
+_shtab_ahriman_repo_setup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
+  "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  "--packager[packager name and email (default\: None)]:packager:"
+  "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
+  "--sign-key[sign key id (default\: None)]:sign_key:"
+  "*--sign-target[sign options (default\: None)]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service (default\: None)]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
+)
+
+_shtab_ahriman_repo_sign_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::sign only specified packages (default\: None):"
+)
+
+_shtab_ahriman_repo_status_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-s,--status}"[new status (default\: BuildStatusEnum.Success)]:status:(unknown pending building failed success)"
+)
+
+_shtab_ahriman_repo_sync_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_tree_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-p,--partitions}"[also divide packages by independent partitions (default\: 1)]:partitions:"
+)
+
+_shtab_ahriman_repo_triggers_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::instead of running all triggers as set by configuration, just process specified ones in order of mention (default\: None):"
+)
+
+_shtab_ahriman_repo_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  "--dry-run[just perform check for updates, same as check command (default\: False)]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {-u,--username}"[build as user (default\: None)]:username:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  "(*)::filter check by package base (default\: None):"
+)
+
+_shtab_ahriman_report_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_search_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name (default\: name)]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
+  "(*):search terms, can be specified multiple times, the result will match all terms:"
+)
+
+_shtab_ahriman_service_clean_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
+)
+
+_shtab_ahriman_service_config_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
+  ":filter settings by section (default\: None):"
+  ":filter settings by key (default\: None):"
+)
+
+_shtab_ahriman_service_config_validate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
+)
+
+_shtab_ahriman_service_key_import_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--key-server[key server for key import (default\: keyserver.ubuntu.com)]:key_server:"
+  ":PGP key to import from public server:"
+)
+
+_shtab_ahriman_service_repositories_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--id-only,--no-id-only}"[show machine readable identifier instead (default\: False)]:id_only:"
+)
+
+_shtab_ahriman_service_setup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
+  "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  "--packager[packager name and email (default\: None)]:packager:"
+  "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
+  "--sign-key[sign key id (default\: None)]:sign_key:"
+  "*--sign-target[sign options (default\: None)]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service (default\: None)]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
+)
+
+_shtab_ahriman_service_shell_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":instead of dropping into shell, just execute the specified code (default\: None):"
+)
+
+_shtab_ahriman_service_tree_migrate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_setup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
+  "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  "--packager[packager name and email (default\: None)]:packager:"
+  "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
+  "--sign-key[sign key id (default\: None)]:sign_key:"
+  "*--sign-target[sign options (default\: None)]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service (default\: None)]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
+)
+
+_shtab_ahriman_shell_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":instead of dropping into shell, just execute the specified code (default\: None):"
+)
+
+_shtab_ahriman_sign_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::sign only specified packages (default\: None):"
+)
+
+_shtab_ahriman_status_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--ahriman[get service status itself (default\: False)]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {-s,--status}"[filter packages by status (default\: None)]:status:(unknown pending building failed success)"
+  "(*)::filter status by package base (default\: None):"
+)
+
+_shtab_ahriman_status_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-s,--status}"[new package build status (default\: BuildStatusEnum.Success)]:status:(unknown pending building failed success)"
+  "(*)::set status for specified packages. If no packages supplied, service status will be updated (default\: None):"
+)
+
+_shtab_ahriman_sync_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  "--dry-run[just perform check for updates, same as check command (default\: False)]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {-u,--username}"[build as user (default\: None)]:username:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
+  "(*)::filter check by package base (default\: None):"
+)
+
+_shtab_ahriman_user_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--key[optional PGP key used by this user. The private key must be imported (default\: None)]:key:"
+  "--packager[optional packager id used for build process in form of \`Name Surname \<mail\@example.com\>\` (default\: None)]:packager:"
+  {-p,--password}"[user password. Blank password will be treated as empty password, which is in particular must be used for OAuth2 authorization type. (default\: None)]:password:"
+  {-R,--role}"[user access level (default\: UserAccess.Read)]:role:(unauthorized read reporter full)"
+  ":username for web service:"
+)
+
+_shtab_ahriman_user_list_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
+  {-R,--role}"[filter users by role (default\: None)]:role:(unauthorized read reporter full)"
+  ":filter users by username (default\: None):"
+)
+
+_shtab_ahriman_user_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":username for web service:"
+)
+
+_shtab_ahriman_version_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_web_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+
+_shtab_ahriman() {
+  local context state line curcontext="$curcontext" one_or_more='(-)*' remainder='(*)'
+
+  if ((${_shtab_ahriman_options[(I)${(q)one_or_more}*]} + ${_shtab_ahriman_options[(I)${(q)remainder}*]} == 0)); then  # noqa: E501
+    _shtab_ahriman_options+=(': :_shtab_ahriman_commands' '*::: :->ahriman')
+  fi
+  _arguments -C -s $_shtab_ahriman_options
+
+  case $state in
+    ahriman)
+      words=($line[1] "${words[@]}")
+      (( CURRENT += 1 ))
+      curcontext="${curcontext%:*:*}:_shtab_ahriman-$line[1]:"
+      case $line[1] in
+        add) _arguments -C -s $_shtab_ahriman_add_options ;;
+        aur-search) _arguments -C -s $_shtab_ahriman_aur_search_options ;;
+        check) _arguments -C -s $_shtab_ahriman_check_options ;;
+        clean) _arguments -C -s $_shtab_ahriman_clean_options ;;
+        config) _arguments -C -s $_shtab_ahriman_config_options ;;
+        config-validate) _arguments -C -s $_shtab_ahriman_config_validate_options ;;
+        daemon) _arguments -C -s $_shtab_ahriman_daemon_options ;;
+        help) _arguments -C -s $_shtab_ahriman_help_options ;;
+        help-commands-unsafe) _arguments -C -s $_shtab_ahriman_help_commands_unsafe_options ;;
+        help-updates) _arguments -C -s $_shtab_ahriman_help_updates_options ;;
+        help-version) _arguments -C -s $_shtab_ahriman_help_version_options ;;
+        init) _arguments -C -s $_shtab_ahriman_init_options ;;
+        key-import) _arguments -C -s $_shtab_ahriman_key_import_options ;;
+        package-add) _arguments -C -s $_shtab_ahriman_package_add_options ;;
+        package-remove) _arguments -C -s $_shtab_ahriman_package_remove_options ;;
+        package-status) _arguments -C -s $_shtab_ahriman_package_status_options ;;
+        package-status-remove) _arguments -C -s $_shtab_ahriman_package_status_remove_options ;;
+        package-status-update) _arguments -C -s $_shtab_ahriman_package_status_update_options ;;
+        package-update) _arguments -C -s $_shtab_ahriman_package_update_options ;;
+        patch-add) _arguments -C -s $_shtab_ahriman_patch_add_options ;;
+        patch-list) _arguments -C -s $_shtab_ahriman_patch_list_options ;;
+        patch-remove) _arguments -C -s $_shtab_ahriman_patch_remove_options ;;
+        patch-set-add) _arguments -C -s $_shtab_ahriman_patch_set_add_options ;;
+        rebuild) _arguments -C -s $_shtab_ahriman_rebuild_options ;;
+        remove) _arguments -C -s $_shtab_ahriman_remove_options ;;
+        remove-unknown) _arguments -C -s $_shtab_ahriman_remove_unknown_options ;;
+        repo-backup) _arguments -C -s $_shtab_ahriman_repo_backup_options ;;
+        repo-check) _arguments -C -s $_shtab_ahriman_repo_check_options ;;
+        repo-clean) _arguments -C -s $_shtab_ahriman_repo_clean_options ;;
+        repo-config) _arguments -C -s $_shtab_ahriman_repo_config_options ;;
+        repo-config-validate) _arguments -C -s $_shtab_ahriman_repo_config_validate_options ;;
+        repo-create-keyring) _arguments -C -s $_shtab_ahriman_repo_create_keyring_options ;;
+        repo-create-mirrorlist) _arguments -C -s $_shtab_ahriman_repo_create_mirrorlist_options ;;
+        repo-daemon) _arguments -C -s $_shtab_ahriman_repo_daemon_options ;;
+        repo-init) _arguments -C -s $_shtab_ahriman_repo_init_options ;;
+        repo-rebuild) _arguments -C -s $_shtab_ahriman_repo_rebuild_options ;;
+        repo-remove-unknown) _arguments -C -s $_shtab_ahriman_repo_remove_unknown_options ;;
+        repo-report) _arguments -C -s $_shtab_ahriman_repo_report_options ;;
+        repo-restore) _arguments -C -s $_shtab_ahriman_repo_restore_options ;;
+        repo-setup) _arguments -C -s $_shtab_ahriman_repo_setup_options ;;
+        repo-sign) _arguments -C -s $_shtab_ahriman_repo_sign_options ;;
+        repo-status-update) _arguments -C -s $_shtab_ahriman_repo_status_update_options ;;
+        repo-sync) _arguments -C -s $_shtab_ahriman_repo_sync_options ;;
+        repo-tree) _arguments -C -s $_shtab_ahriman_repo_tree_options ;;
+        repo-triggers) _arguments -C -s $_shtab_ahriman_repo_triggers_options ;;
+        repo-update) _arguments -C -s $_shtab_ahriman_repo_update_options ;;
+        report) _arguments -C -s $_shtab_ahriman_report_options ;;
+        search) _arguments -C -s $_shtab_ahriman_search_options ;;
+        service-clean) _arguments -C -s $_shtab_ahriman_service_clean_options ;;
+        service-config) _arguments -C -s $_shtab_ahriman_service_config_options ;;
+        service-config-validate) _arguments -C -s $_shtab_ahriman_service_config_validate_options ;;
+        service-key-import) _arguments -C -s $_shtab_ahriman_service_key_import_options ;;
+        service-repositories) _arguments -C -s $_shtab_ahriman_service_repositories_options ;;
+        service-setup) _arguments -C -s $_shtab_ahriman_service_setup_options ;;
+        service-shell) _arguments -C -s $_shtab_ahriman_service_shell_options ;;
+        service-tree-migrate) _arguments -C -s $_shtab_ahriman_service_tree_migrate_options ;;
+        setup) _arguments -C -s $_shtab_ahriman_setup_options ;;
+        shell) _arguments -C -s $_shtab_ahriman_shell_options ;;
+        sign) _arguments -C -s $_shtab_ahriman_sign_options ;;
+        status) _arguments -C -s $_shtab_ahriman_status_options ;;
+        status-update) _arguments -C -s $_shtab_ahriman_status_update_options ;;
+        sync) _arguments -C -s $_shtab_ahriman_sync_options ;;
+        update) _arguments -C -s $_shtab_ahriman_update_options ;;
+        user-add) _arguments -C -s $_shtab_ahriman_user_add_options ;;
+        user-list) _arguments -C -s $_shtab_ahriman_user_list_options ;;
+        user-remove) _arguments -C -s $_shtab_ahriman_user_remove_options ;;
+        version) _arguments -C -s $_shtab_ahriman_version_options ;;
+        web) _arguments -C -s $_shtab_ahriman_web_options ;;
+      esac
+  esac
+}
+
+
+
+typeset -A opt_args
+_shtab_ahriman "$@"

pyproject.toml

@@ -0,0 +1,84 @@
+[build-system]
+requires = ["flit_core"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "ahriman"
+
+description = "ArcH linux ReposItory MANager"
+readme = "README.md"
+
+requires-python = ">=3.11"
+
+license = {file = "COPYING"}
+authors = [
+    {name = "ahriman team"},
+]
+
+dependencies = [
+    "cerberus",
+    "inflection",
+    "passlib",
+    "requests",
+    "srcinfo",
+]
+
+dynamic = ["version"]
+
+[project.urls]
+Documentation = "https://ahriman.readthedocs.io/"
+Repository = "https://github.com/arcan1s/ahriman"
+Changelog = "https://github.com/arcan1s/ahriman/releases"
+
+[project.scripts]
+ahriman = "ahriman.application.ahriman:run"
+
+[project.optional-dependencies]
+check = [
+    "autopep8",
+    "bandit",
+    "mypy",
+    "pylint",
+]
+ docs = [
+     "Sphinx",
+     "argparse-manpage",
+     "pydeps",
+     "shtab",
+     "sphinx-argparse",
+     "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
+ ]
+journald = [
+    "systemd-python",
+]
+# FIXME technically this dependency is required, but in some cases we do not have access to
+# the libalpm which is required in order to install the package. Thus in case if we do not
+# really need to run the application we can move it to "optional" dependencies
+pacman = [
+    "pyalpm",
+]
+s3 = [
+    "boto3",
+]
+tests = [
+    "pytest",
+    "pytest-aiohttp",
+    "pytest-cov",
+    "pytest-helpers-namespace",
+    "pytest-mock",
+    "pytest-resource-path",
+    "pytest-spec",
+]
+web = [
+    "Jinja2",
+    "aioauth-client",
+    "aiohttp",
+    "aiohttp-apispec",
+    "aiohttp_cors",
+    "aiohttp_jinja2",
+    "aiohttp_debugtoolbar",
+    "aiohttp_session",
+    "aiohttp_security",
+    "cryptography",
+    "requests-unixsocket",  # required by unix socket support
+]

setup.py

@@ -1,156 +0,0 @@
-from pathlib import Path
-from setuptools import find_packages, setup
-from typing import Any
-
-
-metadata_path = Path(__file__).resolve().parent / "src/ahriman/version.py"
-metadata: dict[str, Any] = {}
-with metadata_path.open() as metadata_file:
-    exec(metadata_file.read(), metadata)  # pylint: disable=exec-used
-
-
-setup(
-    name="ahriman",
-
-    version=metadata["__version__"],
-    zip_safe=False,
-
-    description="ArcH linux ReposItory MANager",
-
-    author="ahriman team",
-    author_email="",
-    url="https://github.com/arcan1s/ahriman",
-
-    license="GPL3",
-
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    package_data={"": ["py.typed"]},
-
-    dependency_links=[
-    ],
-    install_requires=[
-        "cerberus",
-        "inflection",
-        "passlib",
-        "requests",
-        "srcinfo",
-    ],
-    setup_requires=[
-    ],
-    tests_require=[
-        "pytest",
-        "pytest-aiohttp",
-        "pytest-cov",
-        "pytest-helpers-namespace",
-        "pytest-mock",
-        "pytest-spec",
-        "pytest-resource-path",
-    ],
-
-    include_package_data=True,
-    scripts=[
-        "package/bin/ahriman",
-    ],
-    data_files=[
-        # configuration
-        ("share/ahriman/settings", [
-            "package/share/ahriman/settings/ahriman.ini",
-        ]),
-        ("share/ahriman/settings/ahriman.ini.d", [
-            "package/share/ahriman/settings/ahriman.ini.d/logging.ini",
-        ]),
-        # systemd files
-        ("lib/systemd/system", [
-            "package/lib/systemd/system/ahriman@.service",
-            "package/lib/systemd/system/ahriman@.timer",
-            "package/lib/systemd/system/ahriman-web@.service",
-        ]),
-        # templates
-        ("share/ahriman/templates", [
-            "package/share/ahriman/templates/api.jinja2",
-            "package/share/ahriman/templates/build-status.jinja2",
-            "package/share/ahriman/templates/email-index.jinja2",
-            "package/share/ahriman/templates/error.jinja2",
-            "package/share/ahriman/templates/repo-index.jinja2",
-            "package/share/ahriman/templates/shell",
-            "package/share/ahriman/templates/telegram-index.jinja2",
-        ]),
-        ("share/ahriman/templates/build-status", [
-            "package/share/ahriman/templates/build-status/alerts.jinja2",
-            "package/share/ahriman/templates/build-status/key-import-modal.jinja2",
-            "package/share/ahriman/templates/build-status/login-modal.jinja2",
-            "package/share/ahriman/templates/build-status/package-add-modal.jinja2",
-            "package/share/ahriman/templates/build-status/package-info-modal.jinja2",
-            "package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2",
-            "package/share/ahriman/templates/build-status/table.jinja2",
-        ]),
-        ("share/ahriman/templates/static", [
-            "package/share/ahriman/templates/static/favicon.ico",
-        ]),
-        ("share/ahriman/templates/utils", [
-            "package/share/ahriman/templates/utils/bootstrap-scripts.jinja2",
-            "package/share/ahriman/templates/utils/style.jinja2",
-        ]),
-        # man pages
-        ("share/man/man1", [
-            "docs/ahriman.1",
-        ]),
-        # shell completions
-        ("share/bash-completion/completions", [
-            "docs/completions/bash/_ahriman",
-        ]),
-        ("share/zsh/site-functions", [
-            "docs/completions/zsh/_ahriman",
-        ]),
-    ],
-
-    extras_require={
-        "check": [
-            "autopep8",
-            "bandit",
-            "mypy",
-            "pylint",
-        ],
-        "docs": [
-            "Sphinx",
-            "argparse-manpage",
-            "pydeps",
-            "shtab",
-            "sphinx-argparse",
-            "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
-            "sphinxcontrib-napoleon",
-        ],
-        # FIXME technically this dependency is required, but in some cases we do not have access to
-        # the libalpm which is required in order to install the package. Thus in case if we do not
-        # really need to run the application we can move it to "optional" dependencies
-        "pacman": [
-            "pyalpm",
-        ],
-        "s3": [
-            "boto3",
-        ],
-        "tests": [
-            "pytest",
-            "pytest-aiohttp",
-            "pytest-cov",
-            "pytest-helpers-namespace",
-            "pytest-mock",
-            "pytest-resource-path",
-            "pytest-spec",
-        ],
-        "web": [
-            "Jinja2",
-            "aioauth-client",
-            "aiohttp",
-            "aiohttp-apispec",
-            "aiohttp_cors",
-            "aiohttp_jinja2",
-            "aiohttp_debugtoolbar",
-            "aiohttp_session",
-            "aiohttp_security",
-            "cryptography",
-            "requests-unixsocket",  # required by unix socket support
-        ],
-    },
-)

src/ahriman/__init__.py

@@ -17,3 +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.11.0"

src/ahriman/application/ahriman.py

@@ -19,17 +19,17 @@
 #
 # pylint: disable=too-many-lines
 import argparse
-import sys
 import tempfile
 
 from pathlib import Path
 from typing import TypeVar
 
-from ahriman import version
+from ahriman import __version__
 from ahriman.application import handlers
-from ahriman.core.util import enum_values
+from ahriman.core.util import enum_values, extract_user
 from ahriman.models.action import Action
 from ahriman.models.build_status import BuildStatusEnum
+from ahriman.models.log_handler import LogHandler
 from ahriman.models.package_source import PackageSource
 from ahriman.models.sign_settings import SignSettings
 from ahriman.models.user_access import UserAccess
@@ -58,6 +58,7 @@ def _formatter(prog: str) -> argparse.HelpFormatter:
     return argparse.ArgumentDefaultsHelpFormatter(prog, width=120)
 
 
+# pylint: disable=too-many-statements
 def _parser() -> argparse.ArgumentParser:
     """
     command line parser generator
@@ -68,20 +69,31 @@ def _parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="ahriman", description="ArcH linux ReposItory MANager",
                                      epilog="Argument list can also be read from file by using @ prefix.",
                                      fromfile_prefix_chars="@", formatter_class=_formatter)
-    parser.add_argument("-a", "--architecture", help="target architectures. For several subcommands it can be used "
-                                                     "multiple times", action="append")
-    parser.add_argument("-c", "--configuration", help="configuration path", type=Path, default=Path("/etc/ahriman.ini"))
+    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")
     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")
+    parser.add_argument("--log-handler", help="explicit log handler specification. If none set, the handler will be "
+                                              "guessed from environment",
+                        type=LogHandler, choices=enum_values(LogHandler))
+    parser.add_argument("-q", "--quiet", help="force disable any logging", action="store_true")
     parser.add_argument("--report", help="force enable or disable reporting to web service",
                         action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("-q", "--quiet", help="force disable any logging", action="store_true")
+    parser.add_argument("-r", "--repository", help="filter by target repository")
+    # special secret argument for systemd unit. The issue is that systemd doesn't allow multiple arguments to template
+    # name. This parameter accepts [[arch]-repo] in order to keep backward compatibility
+    parser.add_argument("--repository-id", help=argparse.SUPPRESS)
     parser.add_argument("--unsafe", help="allow to run ahriman as non-ahriman user. Some actions might be unavailable",
                         action="store_true")
-    parser.add_argument("-V", "--version", action="version", version=version.__version__)
+    parser.add_argument("--wait-timeout", help="wait for lock to be free. Negative value will lead to "
+                                               "immediate application run even if there is lock file. "
+                                               "In case of zero value, the application will wait infinitely",
+                        type=int, default=-1)
+    parser.add_argument("-V", "--version", action="version", version=__version__)
 
-    subparsers = parser.add_subparsers(title="command", help="command to run", dest="command", required=True)
+    subparsers = parser.add_subparsers(title="command", help="command to run", dest="command")
 
     _set_aur_search_parser(subparsers)
     _set_help_parser(subparsers)
@@ -99,6 +111,8 @@ def _parser() -> argparse.ArgumentParser:
     _set_patch_set_add_parser(subparsers)
     _set_repo_backup_parser(subparsers)
     _set_repo_check_parser(subparsers)
+    _set_repo_create_keyring_parser(subparsers)
+    _set_repo_create_mirrorlist_parser(subparsers)
     _set_repo_daemon_parser(subparsers)
     _set_repo_rebuild_parser(subparsers)
     _set_repo_remove_unknown_parser(subparsers)
@@ -114,8 +128,10 @@ def _parser() -> argparse.ArgumentParser:
     _set_service_config_parser(subparsers)
     _set_service_config_validate_parser(subparsers)
     _set_service_key_import_parser(subparsers)
+    _set_service_repositories(subparsers)
     _set_service_setup_parser(subparsers)
     _set_service_shell_parser(subparsers)
+    _set_service_tree_migrate_parser(subparsers)
     _set_user_add_parser(subparsers)
     _set_user_list_parser(subparsers)
     _set_user_remove_parser(subparsers)
@@ -144,7 +160,8 @@ def _set_aur_search_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("--sort-by", help="sort field by this field. In case if two packages have the same value of "
                                           "the specified field, they will be always sorted by name",
                         default="name", choices=sorted(handlers.Search.SORT_FIELDS))
-    parser.set_defaults(handler=handlers.Search, architecture=[""], lock=None, report=False, quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.Search, architecture="", lock=None, quiet=True, report=False,
+                        repository="", unsafe=True)
     return parser
 
 
@@ -162,8 +179,8 @@ def _set_help_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="show help message for application or command and exit",
                              formatter_class=_formatter)
     parser.add_argument("command", help="show help message for specific command", nargs="?")
-    parser.set_defaults(handler=handlers.Help, architecture=[""], lock=None, report=False, quiet=True, unsafe=True,
-                        parser=_parser)
+    parser.set_defaults(handler=handlers.Help, architecture="", lock=None, quiet=True, report=False, repository="",
+                        unsafe=True, parser=_parser)
     return parser
 
 
@@ -179,10 +196,10 @@ def _set_help_commands_unsafe_parser(root: SubParserAction) -> argparse.Argument
     """
     parser = root.add_parser("help-commands-unsafe", help="list unsafe commands",
                              description="list unsafe commands as defined in default args", formatter_class=_formatter)
-    parser.add_argument("--command", help="instead of showing commands, just test command line for unsafe subcommand "
-                                          "and return 0 in case if command is safe and 1 otherwise")
-    parser.set_defaults(handler=handlers.UnsafeCommands, architecture=[""], lock=None, report=False, quiet=True,
-                        unsafe=True, parser=_parser)
+    parser.add_argument("command", help="instead of showing commands, just test command line for unsafe subcommand "
+                                        "and return 0 in case if command is safe and 1 otherwise", nargs="*")
+    parser.set_defaults(handler=handlers.UnsafeCommands, architecture="", lock=None, quiet=True, report=False,
+                        repository="", unsafe=True, parser=_parser)
     return parser
 
 
@@ -200,8 +217,8 @@ def _set_help_updates_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="request AUR for current version and compare with current service version",
                              formatter_class=_formatter)
     parser.add_argument("-e", "--exit-code", help="return non-zero exit code if updates available", action="store_true")
-    parser.set_defaults(handler=handlers.ServiceUpdates, architecture=[""], lock=None, report=False, quiet=True,
-                        unsafe=True)
+    parser.set_defaults(handler=handlers.ServiceUpdates, architecture="", lock=None, quiet=True, report=False,
+                        repository="", unsafe=True)
     return parser
 
 
@@ -217,7 +234,8 @@ def _set_help_version_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     parser = root.add_parser("help-version", aliases=["version"], help="application version",
                              description="print application and its dependencies versions", formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Versions, architecture=[""], lock=None, report=False, quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.Versions, architecture="", lock=None, quiet=True, report=False,
+                        repository="", unsafe=True)
     return parser
 
 
@@ -248,12 +266,15 @@ def _set_package_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("--dependencies", help="process missing package dependencies",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
+    parser.add_argument("--increment", help="increment package release (pkgrel) version on duplicate",
+                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-n", "--now", help="run update function after", action="store_true")
     parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
                                                 "-yy to force refresh even if up to date",
                         action="count", default=False)
     parser.add_argument("-s", "--source", help="explicitly specify the package source for this command",
                         type=PackageSource, choices=enum_values(PackageSource), default=PackageSource.Auto)
+    parser.add_argument("-u", "--username", help="build as user", default=extract_user())
     parser.set_defaults(handler=handlers.Add)
     return parser
 
@@ -296,7 +317,7 @@ def _set_package_status_parser(root: SubParserAction) -> argparse.ArgumentParser
                         action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument("-s", "--status", help="filter packages by status",
                         type=BuildStatusEnum, choices=enum_values(BuildStatusEnum))
-    parser.set_defaults(handler=handlers.Status, lock=None, report=False, quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.Status, lock=None, quiet=True, report=False, unsafe=True)
     return parser
 
 
@@ -316,7 +337,7 @@ def _set_package_status_remove_parser(root: SubParserAction) -> argparse.Argumen
                                     "clears the status page.",
                              formatter_class=_formatter)
     parser.add_argument("package", help="remove specified packages from status page", nargs="+")
-    parser.set_defaults(handler=handlers.StatusUpdate, action=Action.Remove, lock=None, report=False, quiet=True,
+    parser.set_defaults(handler=handlers.StatusUpdate, action=Action.Remove, lock=None, quiet=True, report=False,
                         unsafe=True)
     return parser
 
@@ -338,7 +359,7 @@ def _set_package_status_update_parser(root: SubParserAction) -> argparse.Argumen
                         nargs="*")
     parser.add_argument("-s", "--status", help="new package build status",
                         type=BuildStatusEnum, choices=enum_values(BuildStatusEnum), default=BuildStatusEnum.Success)
-    parser.set_defaults(handler=handlers.StatusUpdate, action=Action.Update, lock=None, report=False, quiet=True,
+    parser.set_defaults(handler=handlers.StatusUpdate, action=Action.Update, lock=None, quiet=True, report=False,
                         unsafe=True)
     return parser
 
@@ -365,7 +386,8 @@ def _set_patch_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
                                          "it must end with ()")
     parser.add_argument("patch", help="path to file which contains function or variable value. If not set, "
                                       "the value will be read from stdin", type=Path, nargs="?")
-    parser.set_defaults(handler=handlers.Patch, action=Action.Update, architecture=[""], lock=None, report=False)
+    parser.set_defaults(handler=handlers.Patch, action=Action.Update, architecture="", lock=None, report=False,
+                        repository="")
     return parser
 
 
@@ -385,8 +407,8 @@ def _set_patch_list_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
     parser.add_argument("-v", "--variable", help="if set, show only patches for specified PKGBUILD variables",
                         action="append")
-    parser.set_defaults(handler=handlers.Patch, action=Action.List, architecture=[""], lock=None, report=False,
-                        unsafe=True)
+    parser.set_defaults(handler=handlers.Patch, action=Action.List, architecture="", lock=None, report=False,
+                        repository="", unsafe=True)
     return parser
 
 
@@ -407,7 +429,8 @@ def _set_patch_remove_parser(root: SubParserAction) -> argparse.ArgumentParser:
                                                  "to remove only specified PKGBUILD variables. In case if not set, "
                                                  "it will remove all patches related to the package",
                         action="append")
-    parser.set_defaults(handler=handlers.Patch, action=Action.Remove, architecture=[""], lock=None, report=False)
+    parser.set_defaults(handler=handlers.Patch, action=Action.Remove, architecture="", lock=None, report=False,
+                        repository="")
     return parser
 
 
@@ -431,8 +454,8 @@ def _set_patch_set_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("package", help="path to directory with changed files for patch addition/update", type=Path)
     parser.add_argument("-t", "--track", help="files which has to be tracked", action="append",
                         default=["*.diff", "*.patch"])
-    parser.set_defaults(handler=handlers.Patch, action=Action.Update, architecture=[""], lock=None, report=False,
-                        variable=None)
+    parser.set_defaults(handler=handlers.Patch, action=Action.Update, architecture="", lock=None, report=False,
+                        repository="", variable=None)
     return parser
 
 
@@ -449,7 +472,8 @@ def _set_repo_backup_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser = root.add_parser("repo-backup", help="backup repository data",
                              description="backup repository settings and database", formatter_class=_formatter)
     parser.add_argument("path", help="path of the output archive", type=Path)
-    parser.set_defaults(handler=handlers.Backup, architecture=[""], lock=None, report=False, unsafe=True)
+    parser.set_defaults(handler=handlers.Backup, architecture="", lock=None, report=False, repository="",
+                        unsafe=True)
     return parser
 
 
@@ -473,7 +497,46 @@ def _set_repo_check_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
                                                 "-yy to force refresh even if up to date",
                         action="count", default=False)
-    parser.set_defaults(handler=handlers.Update, dependencies=False, dry_run=True, aur=True, local=True, manual=False)
+    parser.set_defaults(handler=handlers.Update, dependencies=False, dry_run=True, aur=True, local=True, manual=False,
+                        username=None)
+    return parser
+
+
+def _set_repo_create_keyring_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for create-keyring subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("repo-create-keyring", help="create keyring package",
+                             description="create package which contains list of trusted keys as set by "
+                                         "configuration. Note, that this action will only create package, the package "
+                                         "itself has to be built manually",
+                             formatter_class=_formatter)
+    parser.set_defaults(handler=handlers.Triggers, trigger=["ahriman.core.support.KeyringTrigger"])
+    return parser
+
+
+def _set_repo_create_mirrorlist_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for create-mirrorlist subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("repo-create-mirrorlist", help="create mirrorlist package",
+                             description="create package which contains list of available mirrors as set by "
+                                         "configuration. Note, that this action will only create package, the package "
+                                         "itself has to be built manually",
+                             formatter_class=_formatter)
+    parser.set_defaults(handler=handlers.Triggers, trigger=["ahriman.core.support.MirrorlistTrigger"])
     return parser
 
 
@@ -529,7 +592,12 @@ def _set_repo_rebuild_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              "instance. Note, however, that in order to restore packages you need to have original "
                              "ahriman instance run with web service and have run repo-update at least once.",
                         action="store_true")
+    parser.add_argument("--increment", help="increment package release (pkgrel) on duplicate",
+                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
+    parser.add_argument("-s", "--status", help="filter packages by status. Requires --from-database to be set",
+                        type=BuildStatusEnum, choices=enum_values(BuildStatusEnum))
+    parser.add_argument("-u", "--username", help="build as user", default=extract_user())
     parser.set_defaults(handler=handlers.Rebuild)
     return parser
 
@@ -584,7 +652,8 @@ def _set_repo_restore_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="restore settings and database", formatter_class=_formatter)
     parser.add_argument("path", help="path of the input archive", type=Path)
     parser.add_argument("-o", "--output", help="root path of the extracted files", type=Path, default=Path("/"))
-    parser.set_defaults(handler=handlers.Restore, architecture=[""], lock=None, report=False, unsafe=True)
+    parser.set_defaults(handler=handlers.Restore, architecture="", lock=None, report=False, repository="",
+                        unsafe=True)
     return parser
 
 
@@ -621,8 +690,8 @@ def _set_repo_status_update_parser(root: SubParserAction) -> argparse.ArgumentPa
                              description="update repository status on the status page", formatter_class=_formatter)
     parser.add_argument("-s", "--status", help="new status",
                         type=BuildStatusEnum, choices=enum_values(BuildStatusEnum), default=BuildStatusEnum.Success)
-    parser.set_defaults(handler=handlers.StatusUpdate, action=Action.Update, lock=None, report=False, package=[],
-                        quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.StatusUpdate, action=Action.Update, lock=None, package=[], quiet=True,
+                        report=False, unsafe=True)
     return parser
 
 
@@ -657,7 +726,9 @@ def _set_repo_tree_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser = root.add_parser("repo-tree", help="dump repository tree",
                              description="dump repository tree based on packages dependencies",
                              formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Structure, lock=None, report=False, quiet=True, unsafe=True)
+    parser.add_argument("-p", "--partitions", help="also divide packages by independent partitions",
+                        type=int, default=1)
+    parser.set_defaults(handler=handlers.Structure, lock=None, quiet=True, report=False, unsafe=True)
     return parser
 
 
@@ -700,10 +771,13 @@ def _set_repo_update_parser(root: SubParserAction) -> argparse.ArgumentParser:
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--dry-run", help="just perform check for updates, same as check command", action="store_true")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
+    parser.add_argument("--increment", help="increment package release (pkgrel) on duplicate",
+                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--local", help="enable or disable checking of local packages for updates",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--manual", help="include or exclude manual updates",
                         action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("-u", "--username", help="build as user", default=extract_user())
     parser.add_argument("--vcs", help="fetch actual version of VCS packages",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
@@ -755,9 +829,13 @@ def _set_service_config_parser(root: SubParserAction) -> argparse.ArgumentParser
     parser = root.add_parser("service-config", aliases=["config", "repo-config"], help="dump configuration",
                              description="dump configuration for the specified architecture",
                              formatter_class=_formatter)
+    parser.add_argument("section", help="filter settings by section", nargs="?")
+    parser.add_argument("key", help="filter settings by key", nargs="?")
+    parser.add_argument("--info", help="show additional information, e.g. configuration files",
+                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--secure", help="hide passwords and secrets from output",
                         action=argparse.BooleanOptionalAction, default=True)
-    parser.set_defaults(handler=handlers.Dump, lock=None, report=False, quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.Dump, lock=None, quiet=True, report=False, unsafe=True)
     return parser
 
 
@@ -777,7 +855,7 @@ def _set_service_config_validate_parser(root: SubParserAction) -> argparse.Argum
                              formatter_class=_formatter)
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if configuration is invalid",
                         action="store_true")
-    parser.set_defaults(handler=handlers.Validate, lock=None, report=False, quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.Validate, lock=None, quiet=True, report=False, unsafe=True)
     return parser
 
 
@@ -800,7 +878,27 @@ def _set_service_key_import_parser(root: SubParserAction) -> argparse.ArgumentPa
                              formatter_class=_formatter)
     parser.add_argument("--key-server", help="key server for key import", default="keyserver.ubuntu.com")
     parser.add_argument("key", help="PGP key to import from public server")
-    parser.set_defaults(handler=handlers.KeyImport, architecture=[""], lock=None, report=False)
+    parser.set_defaults(handler=handlers.KeyImport, architecture="", lock=None, report=False, repository="")
+    return parser
+
+
+def _set_service_repositories(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for repositories listing
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-repositories", help="show repositories",
+                             description="list all available repositories",
+                             formatter_class=_formatter)
+    parser.add_argument("--id-only", help="show machine readable identifier instead",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.set_defaults(handler=handlers.Repositories, architecture="", lock=None, report=False, repository="",
+                        unsafe=True)
     return parser
 
 
@@ -820,22 +918,23 @@ def _set_service_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              epilog="Create _minimal_ configuration for the service according to provided options.",
                              formatter_class=_formatter)
     parser.add_argument("--build-as-user", help="force makepkg user to the specific one")
-    parser.add_argument("--build-command", help="build command prefix", default="ahriman")
     parser.add_argument("--from-configuration", help="path to default devtools pacman configuration",
-                        type=Path, default=Path("/usr/share/devtools/pacman-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",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--mirror", help="use the specified explicitly mirror instead of including mirrorlist")
     parser.add_argument("--multilib", help="add or do not multilib repository",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--packager", help="packager name and email", required=True)
-    parser.add_argument("--repository", help="repository name", required=True)
+    parser.add_argument("--server", help="server to be used for devtools. If none set, local files will be used")
     parser.add_argument("--sign-key", help="sign key id")
     parser.add_argument("--sign-target", help="sign options", action="append",
                         type=SignSettings.from_option, choices=enum_values(SignSettings))
     parser.add_argument("--web-port", help="port of the web service", type=int)
     parser.add_argument("--web-unix-socket", help="path to unix socket used for interprocess communications", type=Path)
-    parser.set_defaults(handler=handlers.Setup, lock=None, report=False, quiet=True, unsafe=True)
+    parser.set_defaults(handler=handlers.Setup, lock=None, quiet=True, report=False, unsafe=True)
     return parser
 
 
@@ -850,14 +949,29 @@ def _set_service_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
         argparse.ArgumentParser: created argument parser
     """
     parser = root.add_parser("service-shell", aliases=["shell"], help="invoke python shell",
-                             description="drop into python shell while having created application",
-                             formatter_class=_formatter)
+                             description="drop into python shell", formatter_class=_formatter)
     parser.add_argument("code", help="instead of dropping into shell, just execute the specified code", nargs="?")
     parser.add_argument("-v", "--verbose", help=argparse.SUPPRESS, action="store_true")
     parser.set_defaults(handler=handlers.Shell, lock=None, report=False)
     return parser
 
 
+def _set_service_tree_migrate_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for tree migration subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-tree-migrate", help="migrate repository tree",
+                             description="migrate repository tree between versions", formatter_class=_formatter)
+    parser.set_defaults(handler=handlers.TreeMigrate, lock=None, quiet=True, report=False)
+    return parser
+
+
 def _set_user_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for create user subcommand
@@ -871,17 +985,17 @@ def _set_user_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser = root.add_parser("user-add", help="create or update user",
                              description="update user for web services with the given password and role. "
                                          "In case if password was not entered it will be asked interactively",
-                             epilog="In case of first run (i.e. if password salt is not set yet) this action requires "
-                                    "root privileges because it performs write to filesystem configuration.",
                              formatter_class=_formatter)
     parser.add_argument("username", help="username for web service")
+    parser.add_argument("--key", help="optional PGP key used by this user. The private key must be imported")
+    parser.add_argument("--packager", help="optional packager id used for build process in form of "
+                                           "`Name Surname <mail@example.com>`")
     parser.add_argument("-p", "--password", help="user password. Blank password will be treated as empty password, "
                                                  "which is in particular must be used for OAuth2 authorization type.")
-    parser.add_argument("-r", "--role", help="user access level",
+    parser.add_argument("-R", "--role", help="user access level",
                         type=UserAccess, choices=enum_values(UserAccess), default=UserAccess.Read)
-    parser.add_argument("-s", "--secure", help="set file permissions to user-only", action="store_true")
-    parser.set_defaults(handler=handlers.Users, action=Action.Update, architecture=[""], lock=None, report=False,
-                        quiet=True)
+    parser.set_defaults(handler=handlers.Users, action=Action.Update, architecture="", lock=None, quiet=True,
+                        report=False, repository="")
     return parser
 
 
@@ -900,9 +1014,9 @@ def _set_user_list_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              formatter_class=_formatter)
     parser.add_argument("username", help="filter users by username", nargs="?")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
-    parser.add_argument("-r", "--role", help="filter users by role", type=UserAccess, choices=enum_values(UserAccess))
-    parser.set_defaults(handler=handlers.Users, action=Action.List, architecture=[""], lock=None, report=False,  # nosec
-                        password="", quiet=True, unsafe=True)
+    parser.add_argument("-R", "--role", help="filter users by role", type=UserAccess, choices=enum_values(UserAccess))
+    parser.set_defaults(handler=handlers.Users, action=Action.List, architecture="", lock=None, quiet=True,
+                        report=False, repository="", unsafe=True)
     return parser
 
 
@@ -920,8 +1034,8 @@ def _set_user_remove_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="remove user from the user mapping and update the configuration",
                              formatter_class=_formatter)
     parser.add_argument("username", help="username for web service")
-    parser.set_defaults(handler=handlers.Users, action=Action.Remove, architecture=[""], lock=None, report=False,  # nosec
-                        password="", quiet=True)
+    parser.set_defaults(handler=handlers.Users, action=Action.Remove, architecture="", lock=None, quiet=True,
+                        report=False, repository="")
     return parser
 
 
@@ -936,23 +1050,23 @@ def _set_web_parser(root: SubParserAction) -> argparse.ArgumentParser:
         argparse.ArgumentParser: created argument parser
     """
     parser = root.add_parser("web", help="web server", description="start web server", formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Web, lock=Path(tempfile.gettempdir()) / "ahriman-web.lock", report=False,
-                        parser=_parser)
+    parser.set_defaults(handler=handlers.Web, architecture="", lock=Path(tempfile.gettempdir()) / "ahriman-web.lock",
+                        report=False, repository="", parser=_parser)
     return parser
 
 
-def run() -> None:
+def run() -> int:
     """
     run application instance
+
+    Returns:
+        int: application status code
     """
-    if __name__ == "__main__":
-        args_parser = _parser()
-        args = args_parser.parse_args()
+    args_parser = _parser()
+    args = args_parser.parse_args()
 
-        handler: handlers.Handler = args.handler
-        status = handler.execute(args)
+    if args.command is None:  # in case of empty command we would like to print help message
+        args_parser.exit(status=2, message=args_parser.format_help())
 
-        sys.exit(status)
-
-
-run()
+    handler: handlers.Handler = args.handler
+    return handler.execute(args)

src/ahriman/application/application/application.py

@@ -17,10 +17,12 @@
 # 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.abc import Iterable
+from collections.abc import Callable, Iterable
 
 from ahriman.application.application.application_packages import ApplicationPackages
 from ahriman.application.application.application_repository import ApplicationRepository
+from ahriman.core.formatters import UpdatePrinter
+from ahriman.core.tree import Tree
 from ahriman.models.package import Package
 from ahriman.models.result import Result
 
@@ -35,14 +37,15 @@ class Application(ApplicationPackages, ApplicationRepository):
 
             >>> from ahriman.core.configuration import Configuration
             >>> from ahriman.models.package_source import PackageSource
+            >>> from ahriman.models.repository_id import RepositoryId
             >>>
             >>> configuration = Configuration()
-            >>> application = Application("x86_64", configuration, report=True, unsafe=False)
+            >>> application = Application(RepositoryId("x86_64", "x86_64"), configuration, report=True)
             >>> # add packages to build queue
-            >>> application.add(["ahriman"], PackageSource.AUR, without_dependencies=False)
+            >>> application.add(["ahriman"], PackageSource.AUR)
             >>>
             >>> # check for updates
-            >>> updates = application.updates([], aur=True, local=True, manual=True, vcs=True, log_fn=print)
+            >>> updates = application.updates([], aur=True, local=True, manual=True, vcs=True)
             >>> # updates for specified packages
             >>> application.update(updates)
 
@@ -89,6 +92,21 @@ class Application(ApplicationPackages, ApplicationRepository):
         """
         self.repository.triggers.on_stop()
 
+    def print_updates(self, packages: list[Package], *, log_fn: Callable[[str], None]) -> None:
+        """
+        print list of packages to be built. This method will build dependency tree and print updates accordingly
+
+        Args:
+            packages(list[Package]): package list to be printed
+            log_fn(Callable[[str], None]): logger function to log updates
+        """
+        local_versions = {package.base: package.version for package in self.repository.packages()}
+
+        tree = Tree.resolve(packages)
+        for level in tree:
+            for package in level:
+                UpdatePrinter(package, local_versions.get(package.base))(verbose=True, log_fn=log_fn, separator=" -> ")
+
     def with_dependencies(self, packages: list[Package], *, process_dependencies: bool) -> list[Package]:
         """
         add missing dependencies to list of packages
@@ -96,21 +114,25 @@ class Application(ApplicationPackages, ApplicationRepository):
         Args:
             packages(list[Package]): list of source packages of which dependencies have to be processed
             process_dependencies(bool): if no set, dependencies will not be processed
+
+        Returns:
+            list[Package]: updated packages list. Packager for dependencies will be copied from
+        original package
         """
-        def missing_dependencies(source: Iterable[Package]) -> set[str]:
-            # build initial list of dependencies
-            result = set()
-            for package in source:
-                result.update(package.depends_build)
+        def missing_dependencies(source: Iterable[Package]) -> dict[str, str | None]:
+            # append list of known packages with packages which are in current sources
+            satisfied_packages = known_packages | {
+                single
+                for package in source
+                for single in package.packages_full
+            }
 
-            # remove ones which are already well-known
-            result = result.difference(known_packages)
-
-            # remove ones which are in this list already
-            for package in source:
-                result = result.difference(package.packages_full)
-
-            return result
+            return {
+                dependency: package.packager
+                for package in source
+                for dependency in package.depends_build
+                if dependency not in satisfied_packages
+            }
 
         if not process_dependencies or not packages:
             return packages
@@ -119,8 +141,16 @@ class Application(ApplicationPackages, ApplicationRepository):
         with_dependencies = {package.base: package for package in packages}
 
         while missing := missing_dependencies(with_dependencies.values()):
-            for package_name in missing:
-                package = Package.from_aur(package_name, self.repository.pacman)
+            for package_name, username in missing.items():
+                if (source_dir := self.repository.paths.cache_for(package_name)).is_dir():
+                    # there is local cache, load package from it
+                    package = Package.from_build(source_dir, self.repository.architecture, username)
+                else:
+                    package = Package.from_aur(package_name, username)
                 with_dependencies[package.base] = package
 
+                # register package in local database
+                self.database.remote_update(package)
+                self.repository.reporter.set_unknown(package)
+
         return list(with_dependencies.values())

src/ahriman/application/application/application_packages.py

@@ -26,6 +26,7 @@ from typing import Any
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
+from ahriman.core.exceptions import UnknownPackageError
 from ahriman.core.util import package_like
 from ahriman.models.package import Package
 from ahriman.models.package_source import PackageSource
@@ -43,20 +44,26 @@ class ApplicationPackages(ApplicationProperties):
 
         Args:
             source(str): path to package archive
+
+        Raises:
+            UnknownPackageError: if specified path doesn't exist
         """
         local_path = Path(source)
+        if not local_path.is_file():
+            raise UnknownPackageError(source)
+
         dst = self.repository.paths.packages / local_path.name
         shutil.copy(local_path, dst)
 
-    def _add_aur(self, source: str) -> None:
+    def _add_aur(self, source: str, username: str | None) -> None:
         """
         add package from AUR
 
         Args:
             source(str): package base name
+            username(str | None): optional override of username for build process
         """
-        package = Package.from_aur(source, self.repository.pacman)
-
+        package = Package.from_aur(source, username)
         self.database.build_queue_insert(package)
         self.database.remote_update(package)
 
@@ -66,23 +73,37 @@ class ApplicationPackages(ApplicationProperties):
 
         Args:
             source(str): path to local directory
+
+        Raises:
+            UnknownPackageError: if specified package is unknown or doesn't exist
         """
         local_dir = Path(source)
+        if not local_dir.is_dir():
+            raise UnknownPackageError(source)
+
         for full_path in filter(package_like, local_dir.iterdir()):
             self._add_archive(str(full_path))
 
-    def _add_local(self, source: str) -> None:
+    def _add_local(self, source: str, username: str | None) -> None:
         """
         add package from local PKGBUILDs
 
         Args:
             source(str): path to directory with local source files
+            username(str | None): optional override of username for build process
+
+        Raises:
+            UnknownPackageError: if specified package is unknown or doesn't exist
         """
-        source_dir = Path(source)
-        package = Package.from_build(source_dir, self.architecture)
-        cache_dir = self.repository.paths.cache_for(package.base)
-        shutil.copytree(source_dir, cache_dir)  # copy package to store in caches
-        Sources.init(cache_dir)  # we need to run init command in directory where we do have permissions
+        if (source_dir := Path(source)).is_dir():
+            package = Package.from_build(source_dir, self.architecture, username)
+            cache_dir = self.repository.paths.cache_for(package.base)
+            shutil.copytree(source_dir, cache_dir, dirs_exist_ok=True)  # copy package to store in caches
+            Sources.init(cache_dir)  # we need to run init command in directory where we do have permissions
+        elif (source_dir := self.repository.paths.cache_for(source)).is_dir():
+            package = Package.from_build(source_dir, self.architecture, username)
+        else:
+            raise UnknownPackageError(source)
 
         self.database.build_queue_insert(package)
 
@@ -92,39 +113,47 @@ class ApplicationPackages(ApplicationProperties):
 
         Args:
             source(str): remote URL of the package archive
-        """
-        dst = self.repository.paths.packages / Path(source).name  # URL is path, is not it?
-        # timeout=None to suppress pylint warns. Also suppress bandit warnings
-        response = requests.get(source, stream=True, timeout=None)  # nosec
-        response.raise_for_status()
 
+        Raises:
+            UnknownPackageError: if specified package is unknown or doesn't exist
+        """
+        # timeout=None to suppress pylint warns. Also suppress bandit warnings
+        try:
+            response = requests.get(source, stream=True, timeout=None)  # nosec
+            response.raise_for_status()
+        except Exception:
+            raise UnknownPackageError(source)
+
+        dst = self.repository.paths.packages / Path(source).name  # URL is path, is not it?
         with dst.open("wb") as local_file:
             for chunk in response.iter_content(chunk_size=1024):
                 local_file.write(chunk)
 
-    def _add_repository(self, source: str, *_: Any) -> None:
+    def _add_repository(self, source: str, username: str | None) -> None:
         """
         add package from official repository
 
         Args:
             source(str): package base name
+            username(str | None): optional override of username for build process
         """
-        package = Package.from_official(source, self.repository.pacman)
+        package = Package.from_official(source, self.repository.pacman, username)
         self.database.build_queue_insert(package)
         self.database.remote_update(package)
 
-    def add(self, names: Iterable[str], source: PackageSource) -> None:
+    def add(self, names: Iterable[str], source: PackageSource, username: str | None = None) -> None:
         """
         add packages for the next build
 
         Args:
             names(Iterable[str]): list of package bases to add
             source(PackageSource): package source to add
+            username(str | None, optional): optional override of username for build process (Default value = None)
         """
         for name in names:
-            resolved_source = source.resolve(name)
+            resolved_source = source.resolve(name, self.repository.paths)
             fn = getattr(self, f"_add_{resolved_source.value}")
-            fn(name)
+            fn(name, username)
 
     def on_result(self, result: Result) -> None:
         """

src/ahriman/application/application/application_properties.py

@@ -22,6 +22,7 @@ from ahriman.core.database import SQLite
 from ahriman.core.log import LazyLogging
 from ahriman.core.repository import Repository
 from ahriman.models.pacman_synchronization import PacmanSynchronization
+from ahriman.models.repository_id import RepositoryId
 
 
 class ApplicationProperties(LazyLogging):
@@ -29,27 +30,36 @@ class ApplicationProperties(LazyLogging):
     application base properties class
 
     Attributes:
-        architecture(str): repository architecture
         configuration(Configuration): configuration instance
         database(SQLite): database instance
         repository(Repository): repository instance
+        repository_id(RepositoryId): repository unique identifier
     """
 
-    def __init__(self, architecture: str, configuration: Configuration, *, report: bool, unsafe: bool,
+    def __init__(self, repository_id: RepositoryId, configuration: Configuration, *, report: bool,
                  refresh_pacman_database: PacmanSynchronization = PacmanSynchronization.Disabled) -> None:
         """
         default constructor
 
         Args:
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
             refresh_pacman_database(PacmanSynchronization, optional): pacman database synchronization level
                 (Default value = PacmanSynchronization.Disabled)
         """
         self.configuration = configuration
-        self.architecture = architecture
+        self.repository_id = repository_id
         self.database = SQLite.load(configuration)
-        self.repository = Repository.load(architecture, configuration, self.database, report=report, unsafe=unsafe,
+        self.repository = Repository.load(repository_id, configuration, self.database, report=report,
                                           refresh_pacman_database=refresh_pacman_database)
+
+    @property
+    def architecture(self) -> str:
+        """
+        repository architecture for backward compatibility
+
+        Returns:
+            str: repository architecture
+        """
+        return self.repository_id.architecture

src/ahriman/application/application/application_repository.py

@@ -17,14 +17,14 @@
 # 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.abc import Callable, Iterable
+from collections.abc import Iterable
 from pathlib import Path
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
-from ahriman.core.formatters import UpdatePrinter
 from ahriman.core.tree import Tree
 from ahriman.models.package import Package
+from ahriman.models.packagers import Packagers
 from ahriman.models.result import Result
 
 
@@ -83,7 +83,7 @@ class ApplicationRepository(ApplicationProperties):
                 if archive.filepath is None:
                     self.logger.warning("filepath is empty for %s", package.base)
                     continue  # avoid mypy warning
-                self.repository.sign.process_sign_package(archive.filepath, package.base)
+                self.repository.sign.process_sign_package(archive.filepath, None)
         # sign repository database if set
         self.repository.sign.process_sign_repository(self.repository.repo.repo_path)
         # process triggers
@@ -104,14 +104,14 @@ class ApplicationRepository(ApplicationProperties):
             packages: list[str] = []
             for single in probe.packages:
                 try:
-                    _ = Package.from_aur(single, self.repository.pacman)
+                    _ = Package.from_aur(single, None)
                 except Exception:
                     packages.append(single)
             return packages
 
         def unknown_local(probe: Package) -> list[str]:
             cache_dir = self.repository.paths.cache_for(probe.base)
-            local = Package.from_build(cache_dir, self.architecture)
+            local = Package.from_build(cache_dir, self.architecture, None)
             packages = set(probe.packages.keys()).difference(local.packages.keys())
             return list(packages)
 
@@ -123,12 +123,16 @@ class ApplicationRepository(ApplicationProperties):
                 result.extend(unknown_aur(package))  # local package not found
         return result
 
-    def update(self, updates: Iterable[Package]) -> Result:
+    def update(self, updates: Iterable[Package], packagers: Packagers | None = None, *,
+               bump_pkgrel: bool = False) -> Result:
         """
         run package updates
 
         Args:
             updates(Iterable[Package]): list of packages to update
+            packagers(Packagers | None, optional): optional override of username for build process
+                (Default value = None)
+            bump_pkgrel(bool, optional): bump pkgrel in case of local version conflict (Default value = False)
 
         Returns:
             Result: update result
@@ -136,7 +140,7 @@ class ApplicationRepository(ApplicationProperties):
         def process_update(paths: Iterable[Path], result: Result) -> None:
             if not paths:
                 return  # don't need to process if no update supplied
-            update_result = self.repository.process_update(paths)
+            update_result = self.repository.process_update(paths, packagers)
             self.on_result(result.merge(update_result))
 
         # process built packages
@@ -148,14 +152,14 @@ class ApplicationRepository(ApplicationProperties):
         tree = Tree.resolve(updates)
         for num, level in enumerate(tree):
             self.logger.info("processing level #%i %s", num, [package.base for package in level])
-            build_result = self.repository.process_build(level)
+            build_result = self.repository.process_build(level, packagers, bump_pkgrel=bump_pkgrel)
             packages = self.repository.packages_built()
             process_update(packages, build_result)
 
         return build_result
 
     def updates(self, filter_packages: Iterable[str], *,
-                aur: bool, local: bool, manual: bool, vcs: bool, log_fn: Callable[[str], None]) -> list[Package]:
+                aur: bool, local: bool, manual: bool, vcs: bool) -> list[Package]:
         """
         get list of packages to run update process
 
@@ -165,7 +169,6 @@ class ApplicationRepository(ApplicationProperties):
             local(bool): enable or disable checking of local packages for updates
             manual(bool): include or exclude manual updates
             vcs(bool): enable or disable checking of VCS packages
-            log_fn(Callable[[str], None]): logger function to log updates
 
         Returns:
             list[Package]: list of out-of-dated packages
@@ -179,14 +182,4 @@ class ApplicationRepository(ApplicationProperties):
         if manual:
             updates.update({package.base: package for package in self.repository.updates_manual()})
 
-        local_versions = {package.base: package.version for package in self.repository.packages()}
-        updated_packages = [package for _, package in sorted(updates.items())]
-
-        # reorder updates according to the dependency tree
-        tree = Tree.resolve(updated_packages)
-        for level in tree:
-            for package in level:
-                UpdatePrinter(package, local_versions.get(package.base)).print(
-                    verbose=True, log_fn=log_fn, separator=" -> ")
-
-        return updated_packages
+        return [package for _, package in sorted(updates.items())]

src/ahriman/application/handlers/__init__.py

@@ -30,6 +30,7 @@ from ahriman.application.handlers.patch import Patch
 from ahriman.application.handlers.rebuild import Rebuild
 from ahriman.application.handlers.remove import Remove
 from ahriman.application.handlers.remove_unknown import RemoveUnknown
+from ahriman.application.handlers.repositories import Repositories
 from ahriman.application.handlers.restore import Restore
 from ahriman.application.handlers.search import Search
 from ahriman.application.handlers.service_updates import ServiceUpdates
@@ -39,6 +40,7 @@ from ahriman.application.handlers.sign import Sign
 from ahriman.application.handlers.status import Status
 from ahriman.application.handlers.status_update import StatusUpdate
 from ahriman.application.handlers.structure import Structure
+from ahriman.application.handlers.tree_migrate import TreeMigrate
 from ahriman.application.handlers.triggers import Triggers
 from ahriman.application.handlers.unsafe_commands import UnsafeCommands
 from ahriman.application.handlers.update import Update

src/ahriman/application/handlers/add.py

@@ -22,6 +22,8 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.packagers import Packagers
+from ahriman.models.repository_id import RepositoryId
 
 
 class Add(Handler):
@@ -30,27 +32,27 @@ class Add(Handler):
     """
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration,
-                                  report=report, unsafe=unsafe, refresh_pacman_database=args.refresh)
+        application = Application(repository_id, configuration, report=report, refresh_pacman_database=args.refresh)
         application.on_start()
-        application.add(args.package, args.source)
+        application.add(args.package, args.source, args.username)
         if not args.now:
             return
 
-        packages = application.updates(args.package, aur=False, local=False, manual=True, vcs=False,
-                                       log_fn=application.logger.info)
+        packages = application.updates(args.package, aur=False, local=False, manual=True, vcs=False)
         packages = application.with_dependencies(packages, process_dependencies=args.dependencies)
-        result = application.update(packages)
+        packagers = Packagers(args.username, {package.base: package.packager for package in packages})
+
+        application.print_updates(packages, log_fn=application.logger.info)
+        result = application.update(packages, packagers, bump_pkgrel=args.increment)
         Add.check_if_empty(args.exit_code, result.is_empty)

src/ahriman/application/handlers/backup.py

@@ -26,6 +26,7 @@ from tarfile import TarFile
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
+from ahriman.models.repository_id import RepositoryId
 
 
 class Backup(Handler):
@@ -33,20 +34,19 @@ class Backup(Handler):
     backup packages handler
     """
 
-    ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
         backup_paths = Backup.get_paths(configuration)
         with TarFile(args.path, mode="w") as archive:  # well we don't actually use compression

src/ahriman/application/handlers/clean.py

@@ -22,6 +22,7 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.repository_id import RepositoryId
 
 
 class Clean(Handler):
@@ -30,19 +31,18 @@ class Clean(Handler):
     """
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        application = Application(repository_id, configuration, report=report)
         application.on_start()
         application.clean(cache=args.cache, chroot=args.chroot, manual=args.manual, packages=args.packages,
                           pacman=args.pacman)

src/ahriman/application/handlers/daemon.py

@@ -22,6 +22,7 @@ import threading
 
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.repository_id import RepositoryId
 
 
 class Daemon(Handler):
@@ -30,21 +31,20 @@ class Daemon(Handler):
     """
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
         from ahriman.application.handlers import Update
-        Update.run(args, architecture, configuration, report=report, unsafe=unsafe)
-        timer = threading.Timer(args.interval, Daemon.run, args=[args, architecture, configuration],
-                                kwargs={"report": report, "unsafe": unsafe})
+        Update.run(args, repository_id, configuration, report=report)
+        timer = threading.Timer(args.interval, Daemon.run, args=[args, repository_id, configuration],
+                                kwargs={"report": report})
         timer.start()
         timer.join()

src/ahriman/application/handlers/dump.py

@@ -21,7 +21,8 @@ import argparse
 
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters import ConfigurationPrinter
+from ahriman.core.formatters import ConfigurationPathsPrinter, ConfigurationPrinter, StringPrinter
+from ahriman.models.repository_id import RepositoryId
 
 
 class Dump(Handler):
@@ -29,21 +30,32 @@ class Dump(Handler):
     dump configuration handler
     """
 
-    ALLOW_AUTO_ARCHITECTURE_RUN = False
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # conflicting io
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        dump = configuration.dump()
-        for section, values in sorted(dump.items()):
-            ConfigurationPrinter(section, values).print(verbose=not args.secure, separator=" = ")
+        if args.info:
+            root, _ = configuration.check_loaded()
+            ConfigurationPathsPrinter(root, configuration.includes)(verbose=True, separator=" = ")
+
+        match (args.section, args.key):
+            case None, None:  # full configuration
+                dump = configuration.dump()
+                for section, values in sorted(dump.items()):
+                    ConfigurationPrinter(section, values)(verbose=not args.secure, separator=" = ")
+            case section, None:  # section only
+                values = dict(configuration.items(section)) if configuration.has_section(section) else {}
+                ConfigurationPrinter(section, values)(verbose=not args.secure, separator=" = ")
+            case section, key:  # key only
+                value = configuration.get(section, key, fallback="")
+                StringPrinter(value)(verbose=False)

src/ahriman/application/handlers/handler.py

@@ -20,12 +20,14 @@
 import argparse
 import logging
 
+from collections.abc import Iterable
 from multiprocessing import Pool
 
 from ahriman.application.lock import Lock
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import ExitCode, MissingArchitectureError, MultipleArchitecturesError
-from ahriman.core.log import Log
+from ahriman.core.log.log_loader import LogLoader
+from ahriman.models.repository_id import RepositoryId
 from ahriman.models.repository_paths import RepositoryPaths
 
 
@@ -34,7 +36,6 @@ class Handler:
     base handler class for command callbacks
 
     Attributes:
-        ALLOW_AUTO_ARCHITECTURE_RUN(bool): (class attribute) allow defining architecture from existing repositories
         ALLOW_MULTI_ARCHITECTURE_RUN(bool): (class attribute) allow running with multiple architectures
 
     Examples:
@@ -46,57 +47,29 @@ class Handler:
             >>> Add.execute(args)
     """
 
-    ALLOW_AUTO_ARCHITECTURE_RUN = True
     ALLOW_MULTI_ARCHITECTURE_RUN = True
 
     @classmethod
-    def architectures_extract(cls, args: argparse.Namespace) -> list[str]:
-        """
-        get known architectures
-
-        Args:
-            args(argparse.Namespace): command line args
-
-        Returns:
-            list[str]: list of architectures for which tree is created
-
-        Raises:
-            MissingArchitecture: if no architecture set and automatic detection is not allowed or failed
-        """
-        if not cls.ALLOW_AUTO_ARCHITECTURE_RUN and args.architecture is None:
-            # for some parsers (e.g. config) we need to run with specific architecture
-            # for those cases architecture must be set explicitly
-            raise MissingArchitectureError(args.command)
-        if args.architecture:  # architecture is specified explicitly
-            return sorted(set(args.architecture))
-
-        configuration = Configuration()
-        configuration.load(args.configuration)
-        # wtf???
-        root = configuration.getpath("repository", "root")  # pylint: disable=assignment-from-no-return
-        architectures = RepositoryPaths.known_architectures(root)
-
-        if not architectures:  # well we did not find anything
-            raise MissingArchitectureError(args.command)
-        return sorted(architectures)
-
-    @classmethod
-    def call(cls, args: argparse.Namespace, architecture: str) -> bool:
+    def call(cls, args: argparse.Namespace, repository_id: RepositoryId) -> bool:
         """
         additional function to wrap all calls for multiprocessing library
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
 
         Returns:
             bool: True on success, False otherwise
         """
         try:
-            configuration = Configuration.from_path(args.configuration, architecture)
-            Log.load(configuration, quiet=args.quiet, report=args.report)
-            with Lock(args, architecture, configuration):
-                cls.run(args, architecture, configuration, report=args.report, unsafe=args.unsafe)
+            configuration = Configuration.from_path(args.configuration, repository_id)
+
+            log_handler = LogLoader.handler(args.log_handler)
+            LogLoader.load(repository_id, configuration, log_handler, quiet=args.quiet, report=args.report)
+
+            with Lock(args, repository_id, configuration):
+                cls.run(args, repository_id, configuration, report=args.report)
+
             return True
         except ExitCode:
             return False
@@ -117,35 +90,33 @@ class Handler:
             int: 0 on success, 1 otherwise
 
         Raises:
-            MultipleArchitectures: if more than one architecture supplied and no multi architecture supported
+            MultipleArchitecturesError: if more than one architecture supplied and no multi architecture supported
         """
-        architectures = cls.architectures_extract(args)
+        repositories = cls.repositories_extract(args)
 
         # actually we do not have to spawn another process if it is single-process application, do we?
-        if len(architectures) > 1:
+        if len(repositories) > 1:
             if not cls.ALLOW_MULTI_ARCHITECTURE_RUN:
-                raise MultipleArchitecturesError(args.command)
+                raise MultipleArchitecturesError(args.command, repositories)
 
-            with Pool(len(architectures)) as pool:
-                result = pool.starmap(
-                    cls.call, [(args, architecture) for architecture in architectures])
+            with Pool(len(repositories)) as pool:
+                result = pool.starmap(cls.call, [(args, repository_id) for repository_id in repositories])
         else:
-            result = [cls.call(args, architectures.pop())]
+            result = [cls.call(args, repositories.pop())]
 
         return 0 if all(result) else 1
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
 
         Raises:
             NotImplementedError: not implemented method
@@ -165,4 +136,58 @@ class Handler:
             ExitCode: if result is empty and check is enabled
         """
         if enabled and predicate:
-            raise ExitCode()
+            raise ExitCode
+
+    @staticmethod
+    def repositories_extract(args: argparse.Namespace) -> list[RepositoryId]:
+        """
+        get known architectures
+
+        Args:
+            args(argparse.Namespace): command line args
+
+        Returns:
+            list[RepositoryId]: list of repository names and architectures for which tree is created
+
+        Raises:
+            MissingArchitectureError: if no architecture set and automatic detection is not allowed or failed
+        """
+        configuration = Configuration()
+        configuration.load(args.configuration)
+        # pylint, wtf???
+        root = configuration.getpath("repository", "root")  # pylint: disable=assignment-from-no-return
+
+        # preparse systemd repository-id argument
+        # we are using unescaped values, so / is not allowed here, because it is impossible to separate if from dashes
+        if args.repository_id is not None:
+            separator = "/" if "/" in args.repository_id else "-"  # systemd and non-systemd identifiers
+            # repository parts is optional for backward compatibility
+            architecture, *repository_parts = args.repository_id.split(separator)
+            args.architecture = architecture
+            if repository_parts:
+                args.repository = "-".join(repository_parts)  # replace slash with dash
+
+        # extract repository names first
+        if (from_args := args.repository) is not None:
+            repositories: Iterable[str] = [from_args]
+        elif (from_filesystem := RepositoryPaths.known_repositories(root)):
+            repositories = from_filesystem
+        else:  # try to read configuration now
+            repositories = [configuration.get("repository", "name")]
+
+        # extract architecture names
+        if (architecture := args.architecture) is not None:
+            parsed = set(
+                RepositoryId(architecture, repository)
+                for repository in repositories
+            )
+        else:  # try to read from file system
+            parsed = set(
+                RepositoryId(architecture, repository)
+                for repository in repositories
+                for architecture in RepositoryPaths.known_architectures(root, repository)
+            )
+
+        if not parsed:
+            raise MissingArchitectureError(args.command)
+        return sorted(parsed)

src/ahriman/application/handlers/help.py

@@ -21,6 +21,7 @@ import argparse
 
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.repository_id import RepositoryId
 
 
 class Help(Handler):
@@ -28,20 +29,19 @@ class Help(Handler):
     help handler
     """
 
-    ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
         parser: argparse.ArgumentParser = args.parser()
         if args.command is None:

src/ahriman/application/handlers/key_import.py

@@ -22,6 +22,7 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.repository_id import RepositoryId
 
 
 class KeyImport(Handler):
@@ -29,20 +30,19 @@ class KeyImport(Handler):
     key import packages handler
     """
 
-    ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        application = Application(repository_id, configuration, report=report)
         application.repository.sign.key_import(args.key_server, args.key)

src/ahriman/application/handlers/patch.py

@@ -30,6 +30,7 @@ from ahriman.core.formatters import PatchPrinter
 from ahriman.models.action import Action
 from ahriman.models.package import Package
 from ahriman.models.pkgbuild_patch import PkgbuildPatch
+from ahriman.models.repository_id import RepositoryId
 
 
 class Patch(Handler):
@@ -37,32 +38,34 @@ class Patch(Handler):
     patch control handler
     """
 
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
+
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        application = Application(repository_id, configuration, report=report)
         application.on_start()
 
-        if args.action == Action.Update and args.variable is not None:
-            patch = Patch.patch_create_from_function(args.variable, args.patch)
-            Patch.patch_set_create(application, args.package, patch)
-        elif args.action == Action.Update and args.variable is None:
-            package_base, patch = Patch.patch_create_from_diff(args.package, architecture, args.track)
-            Patch.patch_set_create(application, package_base, patch)
-        elif args.action == Action.List:
-            Patch.patch_set_list(application, args.package, args.variable, args.exit_code)
-        elif args.action == Action.Remove:
-            Patch.patch_set_remove(application, args.package, args.variable)
+        match args.action:
+            case Action.Update if args.variable is not None:
+                patch = Patch.patch_create_from_function(args.variable, args.patch)
+                Patch.patch_set_create(application, args.package, patch)
+            case Action.Update:
+                package_base, patch = Patch.patch_create_from_diff(args.package, repository_id.architecture, args.track)
+                Patch.patch_set_create(application, package_base, patch)
+            case Action.List:
+                Patch.patch_set_list(application, args.package, args.variable, args.exit_code)
+            case Action.Remove:
+                Patch.patch_set_remove(application, args.package, args.variable)
 
     @staticmethod
     def patch_create_from_diff(sources_dir: Path, architecture: str, track: list[str]) -> tuple[str, PkgbuildPatch]:
@@ -78,7 +81,7 @@ class Patch(Handler):
             tuple[str, PkgbuildPatch]: package base and created PKGBUILD patch based on the diff from master HEAD
                 to current files
         """
-        package = Package.from_build(sources_dir, architecture)
+        package = Package.from_build(sources_dir, architecture, None)
         patch = Sources.patch_create(sources_dir, *track)
         return package.base, PkgbuildPatch(None, patch)
 
@@ -115,7 +118,7 @@ class Patch(Handler):
         application.database.patches_insert(package_base, patch)
 
     @staticmethod
-    def patch_set_list(application: Application, package_base: str | None, variables: list[str],
+    def patch_set_list(application: Application, package_base: str | None, variables: list[str] | None,
                        exit_code: bool) -> None:
         """
         list patches available for the package base
@@ -123,23 +126,23 @@ class Patch(Handler):
         Args:
             application(Application): application instance
             package_base(str | None): package base
-            variables(list[str]): extract patches only for specified PKGBUILD variables
+            variables(list[str] | None): extract patches only for specified PKGBUILD variables
             exit_code(bool): exit with error on empty search result
         """
         patches = application.database.patches_list(package_base, variables)
         Patch.check_if_empty(exit_code, not patches)
 
         for base, patch in patches.items():
-            PatchPrinter(base, patch).print(verbose=True, separator=" = ")
+            PatchPrinter(base, patch)(verbose=True, separator=" = ")
 
     @staticmethod
-    def patch_set_remove(application: Application, package_base: str, variables: list[str]) -> None:
+    def patch_set_remove(application: Application, package_base: str, variables: list[str] | None) -> None:
         """
         remove patch set for the package base
 
         Args:
             application(Application): application instance
             package_base(str): package base
-            variables(list[str]): remove patches only for specified PKGBUILD variables
+            variables(list[str] | None): remove patches only for specified PKGBUILD variables
         """
         application.database.patches_remove(package_base, variables)

src/ahriman/application/handlers/rebuild.py

@@ -22,8 +22,9 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters import UpdatePrinter
+from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.package import Package
+from ahriman.models.repository_id import RepositoryId
 
 
 class Rebuild(Handler):
@@ -32,45 +33,50 @@ class Rebuild(Handler):
     """
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        application = Application(repository_id, configuration, report=report)
         application.on_start()
 
-        packages = Rebuild.extract_packages(application, from_database=args.from_database)
-        updates = application.repository.packages_depend_on(packages, args.depends_on or None)
+        packages = Rebuild.extract_packages(application, args.status, from_database=args.from_database)
+        updates = application.repository.packages_depend_on(packages, args.depends_on)
 
         Rebuild.check_if_empty(args.exit_code, not updates)
         if args.dry_run:
-            for package in updates:
-                UpdatePrinter(package, package.version).print(verbose=True)
+            application.print_updates(updates, log_fn=print)
             return
 
-        result = application.update(updates)
+        result = application.update(updates, args.username, bump_pkgrel=args.increment)
         Rebuild.check_if_empty(args.exit_code, result.is_empty)
 
     @staticmethod
-    def extract_packages(application: Application, *, from_database: bool) -> list[Package]:
+    def extract_packages(application: Application, status: BuildStatusEnum | None, *,
+                         from_database: bool) -> list[Package]:
         """
         extract packages from database file
 
         Args:
             application(Application): application instance
+            status(BuildStatusEnum | None): optional filter by package status
             from_database(bool): extract packages from database instead of repository filesystem
 
         Returns:
             list[Package]: list of packages which were stored in database
         """
         if from_database:
-            return [package for (package, _) in application.database.packages_get()]
+            return [
+                package
+                for (package, last_status) in application.database.packages_get()
+                if status is None or last_status.status == status
+            ]
+
         return application.repository.packages()

src/ahriman/application/handlers/remove.py

@@ -22,6 +22,7 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.repository_id import RepositoryId
 
 
 class Remove(Handler):
@@ -30,18 +31,17 @@ class Remove(Handler):
     """
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        application = Application(repository_id, configuration, report=report)
         application.on_start()
         application.remove(args.package)

src/ahriman/application/handlers/remove_unknown.py

@@ -23,6 +23,7 @@ from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter
+from ahriman.models.repository_id import RepositoryId
 
 
 class RemoveUnknown(Handler):
@@ -31,25 +32,24 @@ class RemoveUnknown(Handler):
     """
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
-        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        application = Application(repository_id, configuration, report=report)
         application.on_start()
         unknown_packages = application.unknown()
 
         if args.dry_run:
             for package in sorted(unknown_packages):
-                StringPrinter(package).print(verbose=False)
+                StringPrinter(package)(verbose=False)
             return
 
         application.remove(unknown_packages)

src/ahriman/application/handlers/repositories.py

@@ -0,0 +1,54 @@
+#
+# 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/>.
+#
+import argparse
+
+from ahriman.application.handlers import Handler
+from ahriman.core.configuration import Configuration
+from ahriman.core.formatters import RepositoryPrinter
+from ahriman.models.repository_id import RepositoryId
+
+
+class Repositories(Handler):
+    """
+    repositories listing handler
+    """
+
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
+
+    @classmethod
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
+        """
+        callback for command line
+
+        Args:
+            args(argparse.Namespace): command line args
+            repository_id(RepositoryId): repository unique identifier
+            configuration(Configuration): configuration instance
+            report(bool): force enable or disable reporting
+        """
+        dummy_args = argparse.Namespace(
+            architecture=None,
+            configuration=args.configuration,
+            repository=None,
+            repository_id=None,
+        )
+        for repository in cls.repositories_extract(dummy_args):
+            RepositoryPrinter(repository)(verbose=not args.id_only)

src/ahriman/application/handlers/restore.py

@@ -23,6 +23,7 @@ from tarfile import TarFile
 
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
+from ahriman.models.repository_id import RepositoryId
 
 
 class Restore(Handler):
@@ -30,20 +31,19 @@ class Restore(Handler):
     restore packages handler
     """
 
-    ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+    ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
 
     @classmethod
-    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
-            report: bool, unsafe: bool) -> None:
+    def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
+            report: bool) -> None:
         """
         callback for command line
 
         Args:
             args(argparse.Namespace): command line args
-            architecture(str): repository architecture
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
-            unsafe(bool): if set no user check will be performed before path creation
         """
         with TarFile(args.path) as archive:
             archive.extractall(path=args.output)