Release 2.7.1

In previous revisions server was terminated by itself, thus no lock or
socket was removed. In new version, graceful termination of the queue
has been added as well as server now handles singals

.bandit-test.yml

@@ -1 +1 @@
-skips: ['B101', 'B105', 'B106', 'B404']
+skips: ['B101', 'B104', 'B105', 'B106', 'B404']

.github/workflows/setup.sh

@@ -10,7 +10,7 @@ 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-aur python-passlib python-setuptools python-srcinfo sudo
+pacman --noconfirm -Sy base-devel devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-setuptools python-srcinfo sudo
 # make dependencies
 pacman --noconfirm -Sy python-build python-installer python-wheel
 # optional dependencies
@@ -38,7 +38,9 @@ systemd-machine-id-setup
 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 repo-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" "${WEB_ARGS[@]}"
+ahriman -a x86_64 service-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" "${WEB_ARGS[@]}"
+# validate configuration
+ahriman -a x86_64 service-config-validate --exit-code
 # enable services
 systemctl enable ahriman-web@x86_64
 systemctl enable ahriman@x86_64.timer

.pylintrc

@@ -533,5 +533,5 @@ valid-metaclass-classmethod-first-arg=cls
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception

CONTRIBUTING.md

@@ -26,7 +26,101 @@ In order to resolve all difficult cases the `autopep8` is used. You can perform
 Again, the most checks can be performed by `make check` command, though some additional guidelines must be applied:
 
 * Every class, every function (including private and protected), every attribute must be documented. The project follows [Google style documentation](https://google.github.io/styleguide/pyguide.html). The only exception is local functions.
+* Correct way to document function, if section is empty, e.g. no notes or there are no args, it should be omitted:
+
+    ```python
+    def foo(argument: str, *, flag: bool = False) -> int:
+        """
+        do foo. With very very very long
+        docstring
+  
+        Note:
+            Very important note about this function
+  
+        Args:
+            argument(str): an argument. This argument has
+                long description also
+            flag(bool, optional): a flag (Default value = False)
+  
+        Returns:
+            int: result
+  
+        Raises:
+            RuntimeException: a local function error occurs
+  
+        Examples:
+            Very informative example how to use this function, e.g.::
+  
+                >>> foo("argument", flag=False)
+  
+            Note that function documentation is in rST.
+        """
+    ```
+  
+  `Returns` should be replaced with `Yields` for generators.
+
+  Class attributes should be documented in the following way:
+
+    ```python
+    class Clazz(BaseClazz):
+        """
+        brand-new implementation of ``BaseClazz``
+  
+        Attributes:
+            CLAZZ_ATTRIBUTE(int): (class attribute) a brand-new class attribute
+            instance_attribute(str): an instance attribute
+  
+        Examples:
+            Very informative class usage example, e.g.::
+  
+                >>> from module import Clazz
+                >>> clazz = Clazz()
+        """
+  
+        CLAZZ_ATTRIBUTE = 42
+  
+        def __init__(self, *args: Any, **kwargs: Any) -> None:
+            """
+            default constructor
+  
+            Args:
+                *args(Any): positional arguments
+                **kwargs(Any): keyword arguments 
+            """
+            self.instance_attribute = ""
+    ```
+
 * Type annotations are the must, even for local functions.
+* Recommended order of function definitions in class:
+
+    ```python
+    class Clazz:
+  
+        def __init__(self) -> None: ...  # replace with `__post_init__` for dataclasses
+
+        @property
+        def property(self) -> Any: ...
+
+        @classmethod
+        def class_method(cls: Type[Clazz]) -> Clazz: ...
+
+        @staticmethod
+        def static_method() -> Any: ...
+
+        def __private_method(self) -> Any: ...
+
+        def _protected_method(self) -> Any: ...
+
+        def usual_method(self) -> Any: ...
+
+        def __hash__(self) -> int: ...  # basically any magic (or look-alike) method
+    ```
+  
+  Methods inside one group should be ordered alphabetically, the only exception is `__init__` method (`__post__init__` for dataclasses) which should be defined first. For test methods it is recommended to follow the order in which functions are defined.
+
+  Though, we would like to highlight abstract methods (i.e. ones which raise `NotImplementedError`), we still keep in global order at the moment.
+
+* Abstract methods must raise `NotImplementedError` instead of using `abc.abstractmethod`. The reason behind this restriction is the fact that we have class/static abstract methods for those we need to define their attribute first making the code harder to read.
 * For any path interactions `pathlib.Path` must be used.
 * 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.
@@ -59,7 +153,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.
+* No global variable is allowed outside of `ahriman.version` 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.
 

Dockerfile

@@ -5,13 +5,16 @@ ENV AHRIMAN_ARCHITECTURE="x86_64"
 ENV AHRIMAN_DEBUG=""
 ENV AHRIMAN_FORCE_ROOT=""
 ENV AHRIMAN_HOST="0.0.0.0"
+ENV AHRIMAN_MULTILIB="yes"
 ENV AHRIMAN_OUTPUT="syslog"
 ENV AHRIMAN_PACKAGER="ahriman bot <ahriman@example.com>"
+ENV AHRIMAN_PACMAN_MIRROR=""
 ENV AHRIMAN_PORT=""
 ENV AHRIMAN_REPOSITORY="aur-clone"
 ENV AHRIMAN_REPOSITORY_ROOT="/var/lib/ahriman/ahriman"
 ENV AHRIMAN_UNIX_SOCKET=""
 ENV AHRIMAN_USER="ahriman"
+ENV AHRIMAN_VALIDATE_CONFIGURATION="yes"
 
 # install environment
 ## update pacman.conf with multilib
@@ -25,7 +28,7 @@ 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-inflection python-passlib python-requests python-setuptools python-srcinfo && \
+RUN pacman --noconfirm -Sy devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-setuptools python-srcinfo && \
     pacman --noconfirm -Sy python-build python-installer python-wheel && \
     pacman --noconfirm -Sy breezy mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket rsync subversion && \
     runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-jinja2 python-aiohttp-debugtoolbar \

docker/entrypoint.sh

@@ -39,13 +39,22 @@ chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_GNUPG_HOME"
 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_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
-ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" repo-setup "${AHRIMAN_SETUP_ARGS[@]}"
+ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
+
+# validate configuration if set
+[ -n "$AHRIMAN_VALIDATE_CONFIGURATION" ] && ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-config-validate --exit-code
 
 # create machine-id which is required by build tools
 systemd-machine-id-setup &> /dev/null

docs/ahriman.1

@@ -1,9 +1,9 @@
-.TH AHRIMAN "1" "2022\-12\-31" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2023\-03\-06" "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,daemon,help,help-commands-unsafe,key-import,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-clean,clean,repo-config,config,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-setup,init,repo-init,setup,repo-sign,sign,repo-status-update,repo-sync,sync,repo-tree,repo-triggers,repo-update,update,shell,user-add,user-list,user-remove,version,web} ...
+[-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} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager
 
@@ -46,17 +46,17 @@ COMMAND
 \fBahriman\fR \fI\,aur\-search\/\fR
 search for package
 .TP
-\fBahriman\fR \fI\,daemon\/\fR
-run application as daemon
-.TP
 \fBahriman\fR \fI\,help\/\fR
 show help message
 .TP
 \fBahriman\fR \fI\,help\-commands\-unsafe\/\fR
 list unsafe commands
 .TP
-\fBahriman\fR \fI\,key\-import\/\fR
-import PGP key
+\fBahriman\fR \fI\,help\-updates\/\fR
+check for service updates
+.TP
+\fBahriman\fR \fI\,help\-version\/\fR
+application version
 .TP
 \fBahriman\fR \fI\,package\-add\/\fR
 add package
@@ -91,11 +91,8 @@ backup repository data
 \fBahriman\fR \fI\,repo\-check\/\fR
 check for updates
 .TP
-\fBahriman\fR \fI\,repo\-clean\/\fR
-clean local caches
-.TP
-\fBahriman\fR \fI\,repo\-config\/\fR
-dump configuration
+\fBahriman\fR \fI\,repo\-daemon\/\fR
+run application as daemon
 .TP
 \fBahriman\fR \fI\,repo\-rebuild\/\fR
 rebuild repository
@@ -109,9 +106,6 @@ generate report
 \fBahriman\fR \fI\,repo\-restore\/\fR
 restore repository data
 .TP
-\fBahriman\fR \fI\,repo\-setup\/\fR
-initial service configuration
-.TP
 \fBahriman\fR \fI\,repo\-sign\/\fR
 sign packages
 .TP
@@ -130,7 +124,22 @@ run triggers
 \fBahriman\fR \fI\,repo\-update\/\fR
 update packages
 .TP
-\fBahriman\fR \fI\,shell\/\fR
+\fBahriman\fR \fI\,service\-clean\/\fR
+clean local caches
+.TP
+\fBahriman\fR \fI\,service\-config\/\fR
+dump configuration
+.TP
+\fBahriman\fR \fI\,service\-config\-validate\/\fR
+validate system configuration
+.TP
+\fBahriman\fR \fI\,service\-key\-import\/\fR
+import PGP key
+.TP
+\fBahriman\fR \fI\,service\-setup\/\fR
+initial service configuration
+.TP
+\fBahriman\fR \fI\,service\-shell\/\fR
 invoke python shell
 .TP
 \fBahriman\fR \fI\,user\-add\/\fR
@@ -142,15 +151,12 @@ user known users and their access
 \fBahriman\fR \fI\,user\-remove\/\fR
 remove user
 .TP
-\fBahriman\fR \fI\,version\/\fR
-application version
-.TP
 \fBahriman\fR \fI\,web\/\fR
 web server
 
 .SH COMMAND \fI\,'ahriman aur\-search'\/\fR
 usage: ahriman aur\-search [\-h] [\-e] [\-\-info | \-\-no\-info]
-                          [\-\-sort\-by {description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,url,url_path,version}]
+                          [\-\-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 [search ...]
 
 search for package in AUR using API
@@ -169,41 +175,10 @@ return non\-zero exit status if result is empty
 show additional package information (default: False)
 
 .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,url,url_path,version}\/\fR
+\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
 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
 
-.SH COMMAND \fI\,'ahriman daemon'\/\fR
-usage: ahriman daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
-                      [\-\-vcs | \-\-no\-vcs] [\-y]
-
-start process which periodically will run update process
-
-.SH OPTIONS \fI\,'ahriman daemon'\/\fR
-.TP
-\fB\-i\fR \fI\,INTERVAL\/\fR, \fB\-\-interval\fR \fI\,INTERVAL\/\fR
-interval between runs in seconds
-
-.TP
-\fB\-\-aur\fR, \fB\-\-no\-aur\fR
-enable or disable checking for AUR updates. Implies \-\-no\-vcs (default: True)
-
-.TP
-\fB\-\-local\fR, \fB\-\-no\-local\fR
-enable or disable checking of local packages for updates (default: True)
-
-.TP
-\fB\-\-manual\fR, \fB\-\-no\-manual\fR
-include or exclude manual updates (default: True)
-
-.TP
-\fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-enable or disable checking of VCS packages (default: True)
-
-.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 help'\/\fR
 usage: ahriman help [\-h] [command]
 
@@ -224,23 +199,24 @@ list unsafe commands as defined in default args
 instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1
 otherwise
 
-.SH COMMAND \fI\,'ahriman key\-import'\/\fR
-usage: ahriman key\-import [\-h] [\-\-key\-server KEY_SERVER] key
+.SH COMMAND \fI\,'ahriman help\-updates'\/\fR
+usage: ahriman help\-updates [\-h] [\-e]
 
-import PGP key from public sources to the repository user
+request AUR for current version and compare with current service version
 
+.SH OPTIONS \fI\,'ahriman help\-updates'\/\fR
 .TP
-\fBkey\fR
-PGP key to import from public server
+\fB\-e\fR, \fB\-\-exit\-code\fR
+return non\-zero exit code if updates available
 
-.SH OPTIONS \fI\,'ahriman key\-import'\/\fR
-.TP
-\fB\-\-key\-server\fR \fI\,KEY_SERVER\/\fR
-key server for key import
+.SH COMMAND \fI\,'ahriman help\-version'\/\fR
+usage: ahriman help\-version [\-h]
+
+print application and its dependencies versions
 
 .SH COMMAND \fI\,'ahriman package\-add'\/\fR
-usage: ahriman package\-add [\-h] [\-e] [\-n] [\-y] [\-s {auto,archive,aur,directory,local,remote,repository}]
-                           [\-\-without\-dependencies]
+usage: ahriman package\-add [\-h] [\-\-dependencies | \-\-no\-dependencies] [\-e] [\-n] [\-y]
+                           [\-s {auto,archive,aur,directory,local,remote,repository}]
                            package [package ...]
 
 add existing or new package to the build queue
@@ -250,6 +226,10 @@ add existing or new package to the build queue
 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)
+
 .TP
 \fB\-e\fR, \fB\-\-exit\-code\fR
 return non\-zero exit status if result is empty
@@ -266,10 +246,6 @@ 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\-\-without\-dependencies\fR
-do not add dependencies
-
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
 usage: ahriman package\-remove [\-h] package [package ...]
 
@@ -418,43 +394,46 @@ return non\-zero exit status if result is empty
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-enable or disable checking of VCS packages (default: True)
+fetch actual version of VCS packages (default: True)
 
 .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\-clean'\/\fR
-usage: ahriman repo\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
-                          [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
+.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]
 
-remove local caches
+start process which periodically will run update process
 
-.SH OPTIONS \fI\,'ahriman repo\-clean'\/\fR
+.SH OPTIONS \fI\,'ahriman repo\-daemon'\/\fR
 .TP
-\fB\-\-cache\fR, \fB\-\-no\-cache\fR
-clear directory with package caches (default: False)
+\fB\-i\fR \fI\,INTERVAL\/\fR, \fB\-\-interval\fR \fI\,INTERVAL\/\fR
+interval between runs in seconds
 
 .TP
-\fB\-\-chroot\fR, \fB\-\-no\-chroot\fR
-clear build chroot (default: False)
+\fB\-\-aur\fR, \fB\-\-no\-aur\fR
+enable or disable checking for AUR updates (default: True)
+
+.TP
+\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
+process missing package dependencies (default: True)
+
+.TP
+\fB\-\-local\fR, \fB\-\-no\-local\fR
+enable or disable checking of local packages for updates (default: True)
 
 .TP
 \fB\-\-manual\fR, \fB\-\-no\-manual\fR
-clear manually added packages queue (default: False)
+include or exclude manual updates (default: True)
 
 .TP
-\fB\-\-packages\fR, \fB\-\-no\-packages\fR
-clear directory with built packages (default: False)
+\fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
+fetch actual version of VCS packages (default: True)
 
 .TP
-\fB\-\-pacman\fR, \fB\-\-no\-pacman\fR
-clear directory with pacman local database cache (default: False)
-
-.SH COMMAND \fI\,'ahriman repo\-config'\/\fR
-usage: ahriman repo\-config [\-h]
-
-dump configuration for the specified architecture
+\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]
@@ -509,60 +488,6 @@ path of the input archive
 \fB\-o\fR \fI\,OUTPUT\/\fR, \fB\-\-output\fR \fI\,OUTPUT\/\fR
 root path of the extracted files
 
-.SH COMMAND \fI\,'ahriman repo\-setup'\/\fR
-usage: ahriman repo\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-build\-command BUILD_COMMAND]
-                          [\-\-from\-configuration FROM_CONFIGURATION] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
-                          [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER \-\-repository REPOSITORY [\-\-sign\-key SIGN_KEY]
-                          [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
-                          [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
-
-create initial service configuration, requires root
-
-.SH OPTIONS \fI\,'ahriman repo\-setup'\/\fR
-.TP
-\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\-\-makeflags\-jobs\fR, \fB\-\-no\-makeflags\-jobs\fR
-append MAKEFLAGS variable with parallelism set to number of cores (default: True)
-
-.TP
-\fB\-\-multilib\fR, \fB\-\-no\-multilib\fR
-add or do not multilib repository (default: True)
-
-.TP
-\fB\-\-packager\fR \fI\,PACKAGER\/\fR
-packager name and email
-
-.TP
-\fB\-\-repository\fR \fI\,REPOSITORY\/\fR
-repository name
-
-.TP
-\fB\-\-sign\-key\fR \fI\,SIGN_KEY\/\fR
-sign key id
-
-.TP
-\fB\-\-sign\-target\fR \fI\,{disabled,packages,repository}\/\fR
-sign options
-
-.TP
-\fB\-\-web\-port\fR \fI\,WEB_PORT\/\fR
-port of the web service
-
-.TP
-\fB\-\-web\-unix\-socket\fR \fI\,WEB_UNIX_SOCKET\/\fR
-path to unix socket used for interprocess communications
-
 .SH COMMAND \fI\,'ahriman repo\-sign'\/\fR
 usage: ahriman repo\-sign [\-h] [package ...]
 
@@ -602,8 +527,8 @@ run triggers on empty build result as configured by settings
 instead of running all triggers as set by configuration, just process specified ones in order of mention
 
 .SH COMMAND \fI\,'ahriman repo\-update'\/\fR
-usage: ahriman repo\-update [\-h] [\-\-dry\-run] [\-e] [\-\-aur | \-\-no\-aur] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
-                           [\-\-vcs | \-\-no\-vcs] [\-y]
+usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e]
+                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-\-vcs | \-\-no\-vcs] [\-y]
                            [package ...]
 
 check for packages updates and run build process if requested
@@ -613,6 +538,14 @@ check for packages updates and run build process if requested
 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)
+
+.TP
+\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
+process missing package dependencies (default: True)
+
 .TP
 \fB\-\-dry\-run\fR
 just perform check for updates, same as check command
@@ -621,10 +554,6 @@ 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\-\-aur\fR, \fB\-\-no\-aur\fR
-enable or disable checking for AUR updates. Implies \-\-no\-vcs (default: True)
-
 .TP
 \fB\-\-local\fR, \fB\-\-no\-local\fR
 enable or disable checking of local packages for updates (default: True)
@@ -635,14 +564,133 @@ include or exclude manual updates (default: True)
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-enable or disable checking of VCS packages (default: True)
+fetch actual version of VCS packages (default: True)
 
 .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 shell'\/\fR
-usage: ahriman shell [\-h] [code]
+.SH COMMAND \fI\,'ahriman service\-clean'\/\fR
+usage: ahriman service\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
+                             [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
+
+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)
+
+.TP
+\fB\-\-chroot\fR, \fB\-\-no\-chroot\fR
+clear build chroot (default: False)
+
+.TP
+\fB\-\-manual\fR, \fB\-\-no\-manual\fR
+clear manually added packages queue (default: False)
+
+.TP
+\fB\-\-packages\fR, \fB\-\-no\-packages\fR
+clear directory with built packages (default: False)
+
+.TP
+\fB\-\-pacman\fR, \fB\-\-no\-pacman\fR
+clear directory with pacman local database cache (default: False)
+
+.SH COMMAND \fI\,'ahriman service\-config'\/\fR
+usage: ahriman service\-config [\-h] [\-\-secure | \-\-no\-secure]
+
+dump configuration for the specified architecture
+
+.SH OPTIONS \fI\,'ahriman service\-config'\/\fR
+.TP
+\fB\-\-secure\fR, \fB\-\-no\-secure\fR
+hide passwords and secrets from output (default: True)
+
+.SH COMMAND \fI\,'ahriman service\-config\-validate'\/\fR
+usage: ahriman service\-config\-validate [\-h] [\-e]
+
+validate configuration and print found errors
+
+.SH OPTIONS \fI\,'ahriman service\-config\-validate'\/\fR
+.TP
+\fB\-e\fR, \fB\-\-exit\-code\fR
+return non\-zero exit status if configuration is invalid
+
+.SH COMMAND \fI\,'ahriman service\-key\-import'\/\fR
+usage: ahriman service\-key\-import [\-h] [\-\-key\-server KEY_SERVER] key
+
+import PGP key from public sources to the repository user
+
+.TP
+\fBkey\fR
+PGP key to import from public server
+
+.SH OPTIONS \fI\,'ahriman service\-key\-import'\/\fR
+.TP
+\fB\-\-key\-server\fR \fI\,KEY_SERVER\/\fR
+key server for key import
+
+.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
+                             [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
+                             [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
+
+create initial service configuration, requires root
+
+.SH OPTIONS \fI\,'ahriman service\-setup'\/\fR
+.TP
+\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\-\-makeflags\-jobs\fR, \fB\-\-no\-makeflags\-jobs\fR
+append MAKEFLAGS variable with parallelism set to number of cores (default: True)
+
+.TP
+\fB\-\-mirror\fR \fI\,MIRROR\/\fR
+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)
+
+.TP
+\fB\-\-packager\fR \fI\,PACKAGER\/\fR
+packager name and email
+
+.TP
+\fB\-\-repository\fR \fI\,REPOSITORY\/\fR
+repository name
+
+.TP
+\fB\-\-sign\-key\fR \fI\,SIGN_KEY\/\fR
+sign key id
+
+.TP
+\fB\-\-sign\-target\fR \fI\,{disabled,packages,repository}\/\fR
+sign options
+
+.TP
+\fB\-\-web\-port\fR \fI\,WEB_PORT\/\fR
+port of the web service
+
+.TP
+\fB\-\-web\-unix\-socket\fR \fI\,WEB_UNIX_SOCKET\/\fR
+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
 
@@ -700,11 +748,6 @@ remove user from the user mapping and update the configuration
 \fBusername\fR
 username for web service
 
-.SH COMMAND \fI\,'ahriman version'\/\fR
-usage: ahriman version [\-h]
-
-print application and its dependencies versions
-
 .SH COMMAND \fI\,'ahriman web'\/\fR
 usage: ahriman web [\-h]
 

docs/ahriman.application.handlers.rst

@@ -116,6 +116,14 @@ ahriman.application.handlers.search module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.service\_updates module
+----------------------------------------------------
+
+.. automodule:: ahriman.application.handlers.service_updates
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.setup module
 -----------------------------------------
 
@@ -196,6 +204,14 @@ ahriman.application.handlers.users module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.validate module
+--------------------------------------------
+
+.. automodule:: ahriman.application.handlers.validate
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.versions module
 --------------------------------------------
 

docs/ahriman.core.configuration.rst

@@ -0,0 +1,37 @@
+ahriman.core.configuration package
+==================================
+
+Submodules
+----------
+
+ahriman.core.configuration.configuration module
+-----------------------------------------------
+
+.. automodule:: ahriman.core.configuration.configuration
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.configuration.schema module
+----------------------------------------
+
+.. automodule:: ahriman.core.configuration.schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.configuration.validator module
+-------------------------------------------
+
+.. automodule:: ahriman.core.configuration.validator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.configuration
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.database.data.rst

@@ -1,45 +0,0 @@
-ahriman.core.database.data package
-==================================
-
-Submodules
-----------
-
-ahriman.core.database.data.package\_remotes module
---------------------------------------------------
-
-.. automodule:: ahriman.core.database.data.package_remotes
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.core.database.data.package\_statuses module
----------------------------------------------------
-
-.. automodule:: ahriman.core.database.data.package_statuses
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.core.database.data.patches module
------------------------------------------
-
-.. automodule:: ahriman.core.database.data.patches
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.core.database.data.users module
----------------------------------------
-
-.. automodule:: ahriman.core.database.data.users
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.core.database.data
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.core.database.migrations.rst

@@ -44,6 +44,22 @@ ahriman.core.database.migrations.m004\_logs module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.database.migrations.m005\_make\_opt\_depends module
+----------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m005_make_opt_depends
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m006\_packages\_architecture\_required module
+------------------------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m006_packages_architecture_required
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.core.database.rst

@@ -7,7 +7,6 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   ahriman.core.database.data
    ahriman.core.database.migrations
    ahriman.core.database.operations
 

docs/ahriman.core.formatters.rst

@@ -92,6 +92,14 @@ ahriman.core.formatters.user\_printer module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.formatters.validation\_printer module
+--------------------------------------------------
+
+.. automodule:: ahriman.core.formatters.validation_printer
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.formatters.version\_printer module
 -----------------------------------------------
 

docs/ahriman.core.rst

@@ -10,6 +10,7 @@ Subpackages
    ahriman.core.alpm
    ahriman.core.auth
    ahriman.core.build_tools
+   ahriman.core.configuration
    ahriman.core.database
    ahriman.core.formatters
    ahriman.core.gitremote
@@ -24,14 +25,6 @@ Subpackages
 Submodules
 ----------
 
-ahriman.core.configuration module
----------------------------------
-
-.. automodule:: ahriman.core.configuration
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.core.exceptions module
 ------------------------------
 

docs/ahriman.models.rst

@@ -196,14 +196,6 @@ ahriman.models.user\_access module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.models.user\_identity module
-------------------------------------
-
-.. automodule:: ahriman.models.user_identity
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/architecture.rst

@@ -81,6 +81,22 @@ In the most cases handlers spawn god class ``ahriman.application.application.App
 
 Application is designed to run from ``systemd`` services and provides parametrized by architecture timer and service file for that.
 
+Subcommand design
+^^^^^^^^^^^^^^^^^
+
+All subcommands are divided into several groups depending on the role they are doing:
+
+* ``aur`` (``aur-search``) group is for AUR operations.
+* ``help`` (e.g. ``help``) are system commands.
+* ``package`` subcommands (e.g. ``package-add``) allow to perform single package actions.
+* ``patch`` subcommands (e.g. ``pacth-list``) are the special case of ``package`` subcommands introduced in order to control patches for packages.
+* ``repo`` subcommands (e.g. ``repo-check``) usually perform actions on whole repository.
+* ``service`` subcommands (e.g. ``service-setup``) perform actions which are related to whole service managing: create repository, show configuration.
+* ``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.
+
 Database
 --------
 
@@ -98,7 +114,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.
 
-There are also data migrations which are located at ``ahriman.core.database.data`` package and move data from old-style (e.g. json files in filesystem, directory trees, etc) to the database. They are also part of migration and (unlike schema migrations) are applied only at specific version breakpoints (e.g. if ``user_version`` is more than 0 no initial migration will be applied).
+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.
 
 Type conversions
 ^^^^^^^^^^^^^^^^

docs/completions/bash/_ahriman

@@ -1,17 +1,18 @@
 # AUTOMATICALLY GENERATED by `shtab`
 
-_shtab_ahriman_subparsers=('aur-search' 'search' 'daemon' 'help' 'help-commands-unsafe' 'key-import' '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-clean' 'clean' 'repo-config' 'config' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-setup' 'init' 'repo-init' 'setup' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'shell' 'user-add' 'user-list' 'user-remove' 'version' '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-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_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--report' '--no-report' '-q' '--quiet' '--unsafe' '-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_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_help_option_strings=('-h' '--help')
 _shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help' '--command')
-_shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
-_shtab_ahriman_package_add_option_strings=('-h' '--help' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source' '--without-dependencies')
-_shtab_ahriman_add_option_strings=('-h' '--help' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source' '--without-dependencies')
-_shtab_ahriman_package_update_option_strings=('-h' '--help' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source' '--without-dependencies')
+_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_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')
@@ -26,10 +27,8 @@ _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_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_config_option_strings=('-h' '--help')
-_shtab_ahriman_config_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_remove_unknown_option_strings=('-h' '--help' '--dry-run')
@@ -37,10 +36,6 @@ _shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
 _shtab_ahriman_repo_report_option_strings=('-h' '--help')
 _shtab_ahriman_report_option_strings=('-h' '--help')
 _shtab_ahriman_repo_restore_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--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' '--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' '--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' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
 _shtab_ahriman_repo_sign_option_strings=('-h' '--help')
 _shtab_ahriman_sign_option_strings=('-h' '--help')
 _shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
@@ -48,20 +43,36 @@ _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_triggers_option_strings=('-h' '--help')
-_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--dry-run' '-e' '--exit-code' '--aur' '--no-aur' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_update_option_strings=('-h' '--help' '--dry-run' '-e' '--exit-code' '--aur' '--no-aur' '--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' '--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_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_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_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_user_remove_option_strings=('-h' '--help')
-_shtab_ahriman_version_option_strings=('-h' '--help')
 _shtab_ahriman_web_option_strings=('-h' '--help')
 
 
 
-_shtab_ahriman_pos_0_choices=('aur-search' 'search' 'daemon' 'help' 'help-commands-unsafe' 'key-import' '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-clean' 'clean' 'repo-config' 'config' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-setup' 'init' 'repo-init' 'setup' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'shell' 'user-add' 'user-list' 'user-remove' 'version' 'web')
-_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' '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' 'url' 'url_path' 'version')
+_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_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')
 _shtab_ahriman_package_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
@@ -76,12 +87,13 @@ _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_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
 _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')
+_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___role_choices=('unauthorized' 'read' 'reporter' 'full')
 _shtab_ahriman_user_list__r_choices=('unauthorized' 'read' 'reporter' 'full')
@@ -112,54 +124,51 @@ _shtab_ahriman_search__e_nargs=0
 _shtab_ahriman_search___exit_code_nargs=0
 _shtab_ahriman_search___info_nargs=0
 _shtab_ahriman_search___no_info_nargs=0
-_shtab_ahriman_daemon__h_nargs=0
-_shtab_ahriman_daemon___help_nargs=0
-_shtab_ahriman_daemon___aur_nargs=0
-_shtab_ahriman_daemon___no_aur_nargs=0
-_shtab_ahriman_daemon___local_nargs=0
-_shtab_ahriman_daemon___no_local_nargs=0
-_shtab_ahriman_daemon___manual_nargs=0
-_shtab_ahriman_daemon___no_manual_nargs=0
-_shtab_ahriman_daemon___vcs_nargs=0
-_shtab_ahriman_daemon___no_vcs_nargs=0
-_shtab_ahriman_daemon__y_nargs=0
-_shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_help__h_nargs=0
 _shtab_ahriman_help___help_nargs=0
 _shtab_ahriman_help_commands_unsafe__h_nargs=0
 _shtab_ahriman_help_commands_unsafe___help_nargs=0
-_shtab_ahriman_key_import__h_nargs=0
-_shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_help_updates__h_nargs=0
+_shtab_ahriman_help_updates___help_nargs=0
+_shtab_ahriman_help_updates__e_nargs=0
+_shtab_ahriman_help_updates___exit_code_nargs=0
+_shtab_ahriman_help_version__h_nargs=0
+_shtab_ahriman_help_version___help_nargs=0
+_shtab_ahriman_version__h_nargs=0
+_shtab_ahriman_version___help_nargs=0
 _shtab_ahriman_package_add_pos_0_nargs=+
 _shtab_ahriman_package_add__h_nargs=0
 _shtab_ahriman_package_add___help_nargs=0
+_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__n_nargs=0
 _shtab_ahriman_package_add___now_nargs=0
 _shtab_ahriman_package_add__y_nargs=0
 _shtab_ahriman_package_add___refresh_nargs=0
-_shtab_ahriman_package_add___without_dependencies_nargs=0
 _shtab_ahriman_add_pos_0_nargs=+
 _shtab_ahriman_add__h_nargs=0
 _shtab_ahriman_add___help_nargs=0
+_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__n_nargs=0
 _shtab_ahriman_add___now_nargs=0
 _shtab_ahriman_add__y_nargs=0
 _shtab_ahriman_add___refresh_nargs=0
-_shtab_ahriman_add___without_dependencies_nargs=0
 _shtab_ahriman_package_update_pos_0_nargs=+
 _shtab_ahriman_package_update__h_nargs=0
 _shtab_ahriman_package_update___help_nargs=0
+_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__n_nargs=0
 _shtab_ahriman_package_update___now_nargs=0
 _shtab_ahriman_package_update__y_nargs=0
 _shtab_ahriman_package_update___refresh_nargs=0
-_shtab_ahriman_package_update___without_dependencies_nargs=0
 _shtab_ahriman_package_remove_pos_0_nargs=+
 _shtab_ahriman_package_remove__h_nargs=0
 _shtab_ahriman_package_remove___help_nargs=0
@@ -221,34 +230,34 @@ _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_clean__h_nargs=0
-_shtab_ahriman_repo_clean___help_nargs=0
-_shtab_ahriman_repo_clean___cache_nargs=0
-_shtab_ahriman_repo_clean___no_cache_nargs=0
-_shtab_ahriman_repo_clean___chroot_nargs=0
-_shtab_ahriman_repo_clean___no_chroot_nargs=0
-_shtab_ahriman_repo_clean___manual_nargs=0
-_shtab_ahriman_repo_clean___no_manual_nargs=0
-_shtab_ahriman_repo_clean___packages_nargs=0
-_shtab_ahriman_repo_clean___no_packages_nargs=0
-_shtab_ahriman_repo_clean___pacman_nargs=0
-_shtab_ahriman_repo_clean___no_pacman_nargs=0
-_shtab_ahriman_clean__h_nargs=0
-_shtab_ahriman_clean___help_nargs=0
-_shtab_ahriman_clean___cache_nargs=0
-_shtab_ahriman_clean___no_cache_nargs=0
-_shtab_ahriman_clean___chroot_nargs=0
-_shtab_ahriman_clean___no_chroot_nargs=0
-_shtab_ahriman_clean___manual_nargs=0
-_shtab_ahriman_clean___no_manual_nargs=0
-_shtab_ahriman_clean___packages_nargs=0
-_shtab_ahriman_clean___no_packages_nargs=0
-_shtab_ahriman_clean___pacman_nargs=0
-_shtab_ahriman_clean___no_pacman_nargs=0
-_shtab_ahriman_repo_config__h_nargs=0
-_shtab_ahriman_repo_config___help_nargs=0
-_shtab_ahriman_config__h_nargs=0
-_shtab_ahriman_config___help_nargs=0
+_shtab_ahriman_repo_daemon__h_nargs=0
+_shtab_ahriman_repo_daemon___help_nargs=0
+_shtab_ahriman_repo_daemon___aur_nargs=0
+_shtab_ahriman_repo_daemon___no_aur_nargs=0
+_shtab_ahriman_repo_daemon___dependencies_nargs=0
+_shtab_ahriman_repo_daemon___no_dependencies_nargs=0
+_shtab_ahriman_repo_daemon___local_nargs=0
+_shtab_ahriman_repo_daemon___no_local_nargs=0
+_shtab_ahriman_repo_daemon___manual_nargs=0
+_shtab_ahriman_repo_daemon___no_manual_nargs=0
+_shtab_ahriman_repo_daemon___vcs_nargs=0
+_shtab_ahriman_repo_daemon___no_vcs_nargs=0
+_shtab_ahriman_repo_daemon__y_nargs=0
+_shtab_ahriman_repo_daemon___refresh_nargs=0
+_shtab_ahriman_daemon__h_nargs=0
+_shtab_ahriman_daemon___help_nargs=0
+_shtab_ahriman_daemon___aur_nargs=0
+_shtab_ahriman_daemon___no_aur_nargs=0
+_shtab_ahriman_daemon___dependencies_nargs=0
+_shtab_ahriman_daemon___no_dependencies_nargs=0
+_shtab_ahriman_daemon___local_nargs=0
+_shtab_ahriman_daemon___no_local_nargs=0
+_shtab_ahriman_daemon___manual_nargs=0
+_shtab_ahriman_daemon___no_manual_nargs=0
+_shtab_ahriman_daemon___vcs_nargs=0
+_shtab_ahriman_daemon___no_vcs_nargs=0
+_shtab_ahriman_daemon__y_nargs=0
+_shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_repo_rebuild__h_nargs=0
 _shtab_ahriman_repo_rebuild___help_nargs=0
 _shtab_ahriman_repo_rebuild___dry_run_nargs=0
@@ -273,30 +282,6 @@ _shtab_ahriman_report__h_nargs=0
 _shtab_ahriman_report___help_nargs=0
 _shtab_ahriman_repo_restore__h_nargs=0
 _shtab_ahriman_repo_restore___help_nargs=0
-_shtab_ahriman_repo_setup__h_nargs=0
-_shtab_ahriman_repo_setup___help_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_init__h_nargs=0
-_shtab_ahriman_init___help_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___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_setup__h_nargs=0
-_shtab_ahriman_setup___help_nargs=0
-_shtab_ahriman_setup___makeflags_jobs_nargs=0
-_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
-_shtab_ahriman_setup___multilib_nargs=0
-_shtab_ahriman_setup___no_multilib_nargs=0
 _shtab_ahriman_repo_sign_pos_0_nargs=*
 _shtab_ahriman_repo_sign__h_nargs=0
 _shtab_ahriman_repo_sign___help_nargs=0
@@ -317,11 +302,13 @@ _shtab_ahriman_repo_triggers___help_nargs=0
 _shtab_ahriman_repo_update_pos_0_nargs=*
 _shtab_ahriman_repo_update__h_nargs=0
 _shtab_ahriman_repo_update___help_nargs=0
+_shtab_ahriman_repo_update___aur_nargs=0
+_shtab_ahriman_repo_update___no_aur_nargs=0
+_shtab_ahriman_repo_update___dependencies_nargs=0
+_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___aur_nargs=0
-_shtab_ahriman_repo_update___no_aur_nargs=0
 _shtab_ahriman_repo_update___local_nargs=0
 _shtab_ahriman_repo_update___no_local_nargs=0
 _shtab_ahriman_repo_update___manual_nargs=0
@@ -333,11 +320,13 @@ _shtab_ahriman_repo_update___refresh_nargs=0
 _shtab_ahriman_update_pos_0_nargs=*
 _shtab_ahriman_update__h_nargs=0
 _shtab_ahriman_update___help_nargs=0
+_shtab_ahriman_update___aur_nargs=0
+_shtab_ahriman_update___no_aur_nargs=0
+_shtab_ahriman_update___dependencies_nargs=0
+_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___aur_nargs=0
-_shtab_ahriman_update___no_aur_nargs=0
 _shtab_ahriman_update___local_nargs=0
 _shtab_ahriman_update___no_local_nargs=0
 _shtab_ahriman_update___manual_nargs=0
@@ -346,6 +335,104 @@ _shtab_ahriman_update___vcs_nargs=0
 _shtab_ahriman_update___no_vcs_nargs=0
 _shtab_ahriman_update__y_nargs=0
 _shtab_ahriman_update___refresh_nargs=0
+_shtab_ahriman_service_clean__h_nargs=0
+_shtab_ahriman_service_clean___help_nargs=0
+_shtab_ahriman_service_clean___cache_nargs=0
+_shtab_ahriman_service_clean___no_cache_nargs=0
+_shtab_ahriman_service_clean___chroot_nargs=0
+_shtab_ahriman_service_clean___no_chroot_nargs=0
+_shtab_ahriman_service_clean___manual_nargs=0
+_shtab_ahriman_service_clean___no_manual_nargs=0
+_shtab_ahriman_service_clean___packages_nargs=0
+_shtab_ahriman_service_clean___no_packages_nargs=0
+_shtab_ahriman_service_clean___pacman_nargs=0
+_shtab_ahriman_service_clean___no_pacman_nargs=0
+_shtab_ahriman_clean__h_nargs=0
+_shtab_ahriman_clean___help_nargs=0
+_shtab_ahriman_clean___cache_nargs=0
+_shtab_ahriman_clean___no_cache_nargs=0
+_shtab_ahriman_clean___chroot_nargs=0
+_shtab_ahriman_clean___no_chroot_nargs=0
+_shtab_ahriman_clean___manual_nargs=0
+_shtab_ahriman_clean___no_manual_nargs=0
+_shtab_ahriman_clean___packages_nargs=0
+_shtab_ahriman_clean___no_packages_nargs=0
+_shtab_ahriman_clean___pacman_nargs=0
+_shtab_ahriman_clean___no_pacman_nargs=0
+_shtab_ahriman_repo_clean__h_nargs=0
+_shtab_ahriman_repo_clean___help_nargs=0
+_shtab_ahriman_repo_clean___cache_nargs=0
+_shtab_ahriman_repo_clean___no_cache_nargs=0
+_shtab_ahriman_repo_clean___chroot_nargs=0
+_shtab_ahriman_repo_clean___no_chroot_nargs=0
+_shtab_ahriman_repo_clean___manual_nargs=0
+_shtab_ahriman_repo_clean___no_manual_nargs=0
+_shtab_ahriman_repo_clean___packages_nargs=0
+_shtab_ahriman_repo_clean___no_packages_nargs=0
+_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___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___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___secure_nargs=0
+_shtab_ahriman_repo_config___no_secure_nargs=0
+_shtab_ahriman_service_config_validate__h_nargs=0
+_shtab_ahriman_service_config_validate___help_nargs=0
+_shtab_ahriman_service_config_validate__e_nargs=0
+_shtab_ahriman_service_config_validate___exit_code_nargs=0
+_shtab_ahriman_config_validate__h_nargs=0
+_shtab_ahriman_config_validate___help_nargs=0
+_shtab_ahriman_config_validate__e_nargs=0
+_shtab_ahriman_config_validate___exit_code_nargs=0
+_shtab_ahriman_repo_config_validate__h_nargs=0
+_shtab_ahriman_repo_config_validate___help_nargs=0
+_shtab_ahriman_repo_config_validate__e_nargs=0
+_shtab_ahriman_repo_config_validate___exit_code_nargs=0
+_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_setup__h_nargs=0
+_shtab_ahriman_service_setup___help_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___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___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___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___makeflags_jobs_nargs=0
+_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_setup___multilib_nargs=0
+_shtab_ahriman_setup___no_multilib_nargs=0
+_shtab_ahriman_service_shell__h_nargs=0
+_shtab_ahriman_service_shell___help_nargs=0
+_shtab_ahriman_service_shell__v_nargs=0
+_shtab_ahriman_service_shell___verbose_nargs=0
 _shtab_ahriman_shell__h_nargs=0
 _shtab_ahriman_shell___help_nargs=0
 _shtab_ahriman_shell__v_nargs=0
@@ -360,8 +447,6 @@ _shtab_ahriman_user_list__e_nargs=0
 _shtab_ahriman_user_list___exit_code_nargs=0
 _shtab_ahriman_user_remove__h_nargs=0
 _shtab_ahriman_user_remove___help_nargs=0
-_shtab_ahriman_version__h_nargs=0
-_shtab_ahriman_version___help_nargs=0
 _shtab_ahriman_web__h_nargs=0
 _shtab_ahriman_web___help_nargs=0
 

docs/completions/zsh/_ahriman

@@ -10,9 +10,12 @@ _shtab_ahriman_commands() {
     "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"
@@ -32,6 +35,8 @@ _shtab_ahriman_commands() {
     "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"
@@ -46,6 +51,12 @@ _shtab_ahriman_commands() {
     "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"
@@ -76,11 +87,11 @@ _shtab_ahriman_options=(
 
 _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)"
-  "--without-dependencies[do not add dependencies]"
   "(*):package source (base name, path to local files, remote URL):"
 )
 
@@ -88,14 +99,14 @@ _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 url url_path version)"
+  "--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}"[enable or disable checking of VCS packages (default\: \%(default)s)]:vcs:"
+  {--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:"
 )
@@ -111,15 +122,22 @@ _shtab_ahriman_clean_options=(
 
 _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. Implies --no-vcs (default\: \%(default)s)]:aur:"
+  {--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}"[enable or disable checking of VCS packages (default\: \%(default)s)]:vcs:"
+  {--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]"
 )
 
@@ -133,12 +151,22 @@ _shtab_ahriman_help_commands_unsafe_options=(
   "--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:"
@@ -156,11 +184,11 @@ _shtab_ahriman_key_import_options=(
 
 _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)"
-  "--without-dependencies[do not add dependencies]"
   "(*):package source (base name, path to local files, remote URL):"
 )
 
@@ -191,11 +219,11 @@ _shtab_ahriman_package_status_update_options=(
 
 _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)"
-  "--without-dependencies[do not add dependencies]"
   "(*):package source (base name, path to local files, remote URL):"
 )
 
@@ -251,7 +279,7 @@ _shtab_ahriman_repo_backup_options=(
 _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}"[enable or disable checking of VCS packages (default\: \%(default)s)]:vcs:"
+  {--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:"
 )
@@ -267,6 +295,23 @@ _shtab_ahriman_repo_clean_options=(
 
 _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=(
@@ -275,6 +320,7 @@ _shtab_ahriman_repo_init_options=(
   "--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:"
@@ -313,6 +359,7 @@ _shtab_ahriman_repo_setup_options=(
   "--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:"
@@ -347,12 +394,13 @@ _shtab_ahriman_repo_triggers_options=(
 
 _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]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates. Implies --no-vcs (default\: \%(default)s)]:aur:"
   {--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}"[enable or disable checking of VCS packages (default\: \%(default)s)]:vcs:"
+  {--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:"
 )
@@ -365,16 +413,63 @@ _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 url url_path version)"
+  "--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:"
@@ -415,12 +510,13 @@ _shtab_ahriman_sync_options=(
 
 _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]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates. Implies --no-vcs (default\: \%(default)s)]:aur:"
   {--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}"[enable or disable checking of VCS packages (default\: \%(default)s)]:vcs:"
+  {--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:"
 )
@@ -473,9 +569,12 @@ _shtab_ahriman() {
         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 ;;
@@ -495,6 +594,8 @@ _shtab_ahriman() {
         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 ;;
@@ -509,6 +610,12 @@ _shtab_ahriman() {
         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 ;;

docs/conf.py

@@ -35,7 +35,7 @@ for module in (
 # -- Project information -----------------------------------------------------
 
 project = "ahriman"
-copyright = "2021-2022, ahriman team"
+copyright = "2021-2023, ahriman team"
 author = "ahriman team"
 
 # The full version, including alpha/beta/rc tags

docs/configuration.rst

@@ -12,6 +12,14 @@ 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``.
 
+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
+
+It will check current settings on common errors and compare configuration with known schema.
+
 ``settings`` group
 ------------------
 
@@ -20,11 +28,12 @@ Base configuration settings.
 * ``include`` - path to directory with configuration files overrides, string, required.
 * ``database`` - path to SQLite database, string, required.
 * ``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
 --------------
 
-libalpm and AUR related configuration.
+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.
 
 * ``database`` - path to pacman system database cache, string, required.
 * ``mirror`` - package database mirror used by pacman for syncronization, string, required. This option supports standard pacman substitutions with ``$arch`` and ``$repo``. Note that the mentioned mirror should contain all repositories which are set by ``alpm.repositories`` option.
@@ -41,6 +50,7 @@ Base authorization settings. ``OAuth`` provider requires ``aioauth-client`` libr
 * ``allow_read_only`` - allow requesting status APIs without authorization, boolean, required.
 * ``client_id`` - OAuth2 application client ID, string, required in case if ``oauth`` is used.
 * ``client_secret`` - OAuth2 application client secret key, string, required in case if ``oauth`` is used.
+* ``cookie_secret_key`` - secret key which will be used for cookies encryption, string, optional. It must be 32 url-safe base64-encoded bytes and can be generated as following ``base64.urlsafe_b64encode(os.urandom(32)).decode("utf8")``. If not set, it will be generated automatically; note, however, that in this case, all sessions will be automatically expired during restart.
 * ``max_age`` - parameter which controls both cookie expiration and token expiration inside the service, integer, optional, default is 7 days.
 * ``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.
@@ -59,7 +69,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.
-* ``vcs_allowed_age`` - maximal age in seconds of the VCS packages before their version will be updated with its remote source, int, optional, default ``0``.
+* ``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
 --------------------
@@ -78,12 +88,36 @@ Settings for signing packages or repository. Group name can refer to architectur
 * ``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 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.
+
+* ``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.
+* ``host`` - host to bind, string, optional.
+* ``index_url`` - full url of the repository index page, string, optional.
+* ``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.
+* ``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.
+
 ``remote-pull`` group
 ---------------------
 
 Remote git source synchronization settings. Unlike ``Upload`` triggers those triggers are used for PKGBUILD synchronization - fetch from remote repository PKGBUILDs before updating process.
 
-It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details.
+It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
+
+* by SSH key: generate SSH key as ``ahriman`` user and put public part of it to the repository keys.
+* by git credentials helper: consult with the `related man page <https://git-scm.com/docs/gitcredentials>`_.
+
+Available options are:
 
 * ``target`` - list of remote pull triggers to be used, space separated list of strings, optional, defaults to ``gitremote``. It must point to valid section (or to section with architecture), e.g. ``gitremote`` must point to either ``gitremote`` or ``gitremote:x86_64`` (the one with architecture has higher priority).
 
@@ -98,7 +132,12 @@ Remote pull trigger
 
 Remote git source synchronization settings. Same as remote pull triggers those triggers are used for PKGBUILD synchronization - push updated PKGBUILDs to the remote repository after build process.
 
-It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details.
+It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
+
+* by SSH key: generate SSH key as ``ahriman`` user and put public part of it to the repository keys.
+* by git credentials helper: consult with the `related man page <https://git-scm.com/docs/gitcredentials>`_.
+
+Available options are:
 
 * ``target`` - list of remote push triggers to be used, space separated list of strings, optional, defaults to ``gitremote``. It must point to valid section (or to section with architecture), e.g. ``gitremote`` must point to either ``gitremote`` or ``gitremote:x86_64`` (the one with architecture has higher priority).
 
@@ -225,21 +264,3 @@ Requires ``boto3`` library to be installed. Section name must be either ``s3`` (
 * ``chunk_size`` - chunk size for calculating entity tags, int, optional, default 8 * 1024 * 1024.
 * ``region`` - bucket region (e.g. ``eu-central-1``), string, required.
 * ``secret_key`` - AWS secret access key, string, required.
-
-``web:*`` groups
-----------------
-
-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.
-
-* ``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.
-* ``host`` - host to bind, string, optional.
-* ``index_url`` - full url of the repository index page, string, optional.
-* ``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.
-* ``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.
-* ``username`` - username to authorize in web service in order to update service status, string, required in case if authorization enabled.  

docs/faq.rst

@@ -18,7 +18,7 @@ TL;DR
 .. code-block:: shell
 
    yay -S ahriman
-   sudo ahriman -a x86_64 repo-setup --packager "ahriman bot <ahriman@example.com>" --repository "repository"
+   ahriman -a x86_64 service-setup --packager "ahriman bot <ahriman@example.com>" --repository "repository"
    systemctl enable --now ahriman@x86_64.timer
 
 Long answer
@@ -26,6 +26,33 @@ Long answer
 
 The idea is to install the package as usual, create working directory tree, create configuration for ``sudo`` and ``devtools``. Detailed description of the setup instruction can be found :doc:`here <setup>`.
 
+How to validate settings
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+There is special command which can be used in order to validate current configuration:
+
+.. code-block:: shell
+
+   ahriman -a x86_64 service-config-validate --exit-code
+
+This command will print found errors, based on `cerberus <https://docs.python-cerberus.org/>`_, e.g.:
+
+.. code-block:: shell
+
+   auth
+                   ssalt: unknown field
+                   target: none or more than one rule validate
+                           oneof definition 0: unallowed value mapping
+                           oneof definition 1: field 'salt' is required
+                           oneof definition 2: unallowed value mapping
+                           oneof definition 2: field 'salt' is required
+                           oneof definition 2: field 'client_id' is required
+                           oneof definition 2: field 'client_secret' is required
+   gitremote
+                   pull_url: unknown field
+
+If an additional flag ``--exit-code`` is supplied, the application will return non-zero exit code, which can be used partially in scripts.
+
 What does "architecture specific" mean / How to configure for different architectures
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -117,20 +144,9 @@ Before using this command you will need to create local directory, put ``PKGBUIL
 How to fetch PKGBUILDs from remote repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For that purpose you could use ``RemotePullTrigger`` trigger. To do so you will need:
+For that purpose you could use ``RemotePullTrigger`` trigger. To do so you will need to configure trigger as following:
 
-#.
-   Append ``triggers`` option in ``build`` section with the following line:
-
-   .. code-block:: ini
-
-      [build]
-      triggers = ahriman.core.gitremote.RemotePullTrigger
-
-#.
-   Configure trigger as following:
-
-   .. code-block:: ini
+.. code-block:: ini
 
    [remote-pull]
    target = gitremote
@@ -143,20 +159,9 @@ During the next application run it will fetch repository from the specified url
 How to push updated PKGBUILDs to remote repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For that purpose you'd need to use another trigger called ``RemotePushTrigger``. Configure it as following:
+For that purpose you'd need to use another trigger called ``RemotePushTrigger``. Configure trigger as following:
 
-#.
-   Append ``triggers`` option in ``build`` section with the trigger name:
-
-   .. code-block:: ini
-
-      [build]
-      triggers = ahriman.core.gitremote.RemotePushTrigger
-
-#.
-   Configure trigger as following:
-
-   .. code-block:: ini
+.. code-block:: ini
 
    [remote-push]
    target = gitremote
@@ -214,7 +219,7 @@ TL;DR
 
 .. code-block:: shell
 
-   sudo -u ahriman ahriman key-import ...
+   sudo -u ahriman ahriman service-key-import ...
 
 How to update VCS packages
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -386,13 +391,16 @@ The following environment variables are supported:
 * ``AHRIMAN_DEBUG`` - if set all commands will be logged to console.
 * ``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_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_REPOSITORY`` - repository name, default is ``aur-clone``.
 * ``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``.
+* ``AHRIMAN_VALIDATE_CONFIGURATION`` - if set validate service configuration
 
 You can pass any of these variables by using ``-e`` argument, e.g.:
 
@@ -403,11 +411,11 @@ You can pass any of these variables by using ``-e`` argument, e.g.:
 Daemon service
 ^^^^^^^^^^^^^^
 
-There is special ``daemon`` subcommand which emulates systemd timer and will perform repository update periodically:
+There is special ``repo-daemon`` subcommand which emulates systemd timer and will perform repository update periodically:
 
 .. code-block:: shell
 
-   docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest daemon
+   docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest repo-daemon
 
 This command uses same rules as ``repo-update``, thus, e.g. requires ``--privileged`` flag.
 
@@ -436,6 +444,102 @@ 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
 
+
+Non-x86_64 architecture setup
+-----------------------------
+
+The following section describes how to setup ahriman with architecture different from x86_64, as example i686. For most cases you have base repository available, e.g. archlinux32 repositories for i686 architecture; in case if base repository is not available, steps are a bit different, however, idea remains the same.
+
+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:
+
+   .. 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
+
+#.
+   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:
+
+   .. 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
+
+   Alternatively, you can create your own ``makepkg`` configuration and save it as ``/usr/share/devtools/makepkg-i686.conf``.
+
+#.
+   Setup repository as usual:
+
+   .. code-block:: shell
+
+      ahriman -a i686 service-setup --mirror 'http://de.mirror.archlinux32.org/$arch/$repo'--no-multilib ...
+
+   In addition to usual options, you need to specify the following options:
+
+   * ``--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.
+
+Docker container setup
+^^^^^^^^^^^^^^^^^^^^^^
+
+There are two possible ways to achieve same setup, by using docker container. The first one is just mount required files inside container and run it as usual (with specific environment variables). Another one is to create own container based on official one:
+
+#.
+   Clone official container as base:
+
+   .. code-block:: dockerfile
+
+      FROM arcan1s/ahriman:latest
+
+#.
+   Init pacman keys. This command is required in order to populate distribution keys:
+
+   .. code-block:: dockerfile
+
+      RUN pacman-key --init
+
+#.
+   Install packages as it was described above:
+
+   .. 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
+
+#.
+   At that point you should have full ``Dockerfile`` like:
+
+   .. code-block:: dockerfile
+
+      FROM arcan1s/ahriman:latest
+
+      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
+
+#.
+   After that you can build you own container, e.g.:
+
+   .. code-block:: shell
+
+      docker build --tag ahriman-i686:latest
+
+#.
+   Now you can run locally built container as usual with passing environment variables for setup command:
+
+   .. code-block:: shell
+
+      docker run --privileged -p 8080:8080 -e AHRIMAN_ARCHITECTURE=i686 -e AHRIMAN_PACMAN_MIRROR='http://de.mirror.archlinux32.org/$arch/$repo' -e AHRIMAN_MULTILIB= ahriman-i686:latest
+
 Remote synchronization
 ----------------------
 
@@ -784,7 +888,7 @@ The service provides several commands aim to do easy repository backup and resto
 
    .. code-block:: shell
 
-      sudo ahriman repo-backup /tmp/repo.tar.gz
+      ahriman repo-backup /tmp/repo.tar.gz
 
    This command will pack all configuration files together with database file into the archive specified as command line argument (i.e. ``/tmp/repo.tar.gz``). In addition it will also archive ``cache`` directory (the one which contains local clones used by e.g. local packages) and ``.gnupg`` of the ``ahriman`` user.
 
@@ -799,7 +903,7 @@ The service provides several commands aim to do easy repository backup and resto
 
    .. code-block:: shell
 
-      sudo ahriman repo-restore /tmp/repo.tar.gz
+      ahriman repo-restore /tmp/repo.tar.gz
 
    An additional argument ``-o``/``--output`` can be used to specify extraction root (``/`` by default).
 

docs/setup.rst

@@ -10,9 +10,9 @@ Initial setup
 
    .. code-block:: shell
 
-      sudo ahriman -a x86_64 repo-setup ...
+      sudo ahriman -a x86_64 service-setup ...
 
-   ``repo-setup`` literally does the following steps:
+   ``service-setup`` literally does the following steps:
 
    #.
       Create ``/var/lib/ahriman/.makepkg.conf`` with ``makepkg.conf`` overrides if required (at least you might want to set ``PACKAGER``):
@@ -88,4 +88,6 @@ Initial setup
 
    .. code-block:: shell
 
-       sudo -u ahriman ahriman -a x86_64 package-add ahriman --now
+       sudo -u ahriman ahriman -a x86_64 package-add ahriman --now --refresh
+
+   The ``--refresh`` flag is required in order to handle local database update.

docs/triggers.rst

@@ -125,3 +125,8 @@ 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``).
 
 After that run application as usual and receive notification in your slack channel.
+
+Trigger configuration schema
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Triggers can expose their configuration schema. It can be achieved by implementing ``CONFIGURATION_SCHEMA`` class variable according to `cerberus <https://docs.python-cerberus.org/>`_ documentation. For more details and examples, please refer to built-in triggers implementations.

package/archlinux/PKGBUILD

@@ -1,13 +1,13 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.5.0
+pkgver=2.7.1
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
 url="https://github.com/arcan1s/ahriman"
 license=('GPL3')
-depends=('devtools' 'git' 'pyalpm' 'python-inflection' 'python-passlib' 'python-requests' 'python-setuptools' 'python-srcinfo')
+depends=('devtools' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests' 'python-setuptools' 'python-srcinfo')
 makedepends=('python-build' 'python-installer' 'python-wheel')
 optdepends=('breezy: -bzr packages support'
             'darcs: -darcs packages support'

package/share/ahriman/settings/ahriman.ini

@@ -2,6 +2,7 @@
 include = ahriman.ini.d
 logging = ahriman.ini.d/logging.ini
 database = /var/lib/ahriman/ahriman.db
+suppress_http_log_errors = yes
 
 [alpm]
 database = /var/lib/pacman
@@ -23,7 +24,7 @@ build_command = extra-x86_64-build
 ignore_packages =
 makechrootpkg_flags =
 makepkg_flags = --nocolor --ignorearch
-triggers = ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger
+triggers = ahriman.core.gitremote.RemotePullTrigger ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger ahriman.core.gitremote.RemotePushTrigger
 vcs_allowed_age = 604800
 
 [repository]
@@ -33,6 +34,12 @@ root = /var/lib/ahriman
 [sign]
 target =
 
+[remote-pull]
+target =
+
+[remote-push]
+target =
+
 [report]
 target = console
 
@@ -66,3 +73,4 @@ debug_allowed_hosts =
 host = 127.0.0.1
 static_path = /usr/share/ahriman/templates/static
 templates = /usr/share/ahriman/templates
+unix_socket_unsafe = yes

setup.py

@@ -29,6 +29,7 @@ setup(
     dependency_links=[
     ],
     install_requires=[
+        "cerberus",
         "inflection",
         "passlib",
         "requests",

src/ahriman/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/ahriman.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -84,10 +84,10 @@ def _parser() -> argparse.ArgumentParser:
     subparsers = parser.add_subparsers(title="command", help="command to run", dest="command", required=True)
 
     _set_aur_search_parser(subparsers)
-    _set_daemon_parser(subparsers)
     _set_help_parser(subparsers)
     _set_help_commands_unsafe_parser(subparsers)
-    _set_key_import_parser(subparsers)
+    _set_help_updates_parser(subparsers)
+    _set_help_version_parser(subparsers)
     _set_package_add_parser(subparsers)
     _set_package_remove_parser(subparsers)
     _set_package_status_parser(subparsers)
@@ -99,24 +99,26 @@ def _parser() -> argparse.ArgumentParser:
     _set_patch_set_add_parser(subparsers)
     _set_repo_backup_parser(subparsers)
     _set_repo_check_parser(subparsers)
-    _set_repo_clean_parser(subparsers)
-    _set_repo_config_parser(subparsers)
+    _set_repo_daemon_parser(subparsers)
     _set_repo_rebuild_parser(subparsers)
     _set_repo_remove_unknown_parser(subparsers)
     _set_repo_report_parser(subparsers)
     _set_repo_restore_parser(subparsers)
-    _set_repo_setup_parser(subparsers)
     _set_repo_sign_parser(subparsers)
     _set_repo_status_update_parser(subparsers)
     _set_repo_sync_parser(subparsers)
     _set_repo_tree_parser(subparsers)
     _set_repo_triggers_parser(subparsers)
     _set_repo_update_parser(subparsers)
-    _set_shell_parser(subparsers)
+    _set_service_clean_parser(subparsers)
+    _set_service_config_parser(subparsers)
+    _set_service_config_validate_parser(subparsers)
+    _set_service_key_import_parser(subparsers)
+    _set_service_setup_parser(subparsers)
+    _set_service_shell_parser(subparsers)
     _set_user_add_parser(subparsers)
     _set_user_list_parser(subparsers)
     _set_user_remove_parser(subparsers)
-    _set_version_parser(subparsers)
     _set_web_parser(subparsers)
 
     return parser
@@ -146,35 +148,6 @@ def _set_aur_search_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
-def _set_daemon_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for daemon subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("daemon", help="run application as daemon",
-                             description="start process which periodically will run update process",
-                             formatter_class=_formatter)
-    parser.add_argument("-i", "--interval", help="interval between runs in seconds", type=int, default=60 * 60 * 12)
-    parser.add_argument("--aur", help="enable or disable checking for AUR updates. Implies --no-vcs",
-                        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("--vcs", help="enable or disable checking of VCS packages",
-                        action=argparse.BooleanOptionalAction, default=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.set_defaults(handler=handlers.Daemon, dry_run=False, exit_code=False, package=[])
-    return parser
-
-
 def _set_help_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for listing help subcommand
@@ -189,8 +162,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, report=False, quiet=True, unsafe=True,
+                        parser=_parser)
     return parser
 
 
@@ -213,9 +186,9 @@ def _set_help_commands_unsafe_parser(root: SubParserAction) -> argparse.Argument
     return parser
 
 
-def _set_key_import_parser(root: SubParserAction) -> argparse.ArgumentParser:
+def _set_help_updates_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
-    add parser for key import subcommand
+    add parser for service update check subcommand
 
     Args:
         root(SubParserAction): subparsers for the commands
@@ -223,16 +196,28 @@ def _set_key_import_parser(root: SubParserAction) -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: created argument parser
     """
-    parser = root.add_parser("key-import", help="import PGP key",
-                             description="import PGP key from public sources to the repository user",
-                             epilog="By default ahriman runs build process with package sources validation "
-                                    "(in case if signature and keys are available in PKGBUILD). This process will "
-                                    "fail in case if key is not known for build user. This subcommand can be used "
-                                    "in order to import the PGP key to user keychain.",
+    parser = root.add_parser("help-updates", help="check for service updates",
+                             description="request AUR for current version and compare with current service version",
                              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.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)
+    return parser
+
+
+def _set_help_version_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for version subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    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)
     return parser
 
 
@@ -260,6 +245,8 @@ def _set_package_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
                                     "5) and finally you can add package from AUR.",
                              formatter_class=_formatter)
     parser.add_argument("package", help="package source (base name, path to local files, remote URL)", nargs="+")
+    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("-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, "
@@ -267,7 +254,6 @@ def _set_package_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
                         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("--without-dependencies", help="do not add dependencies", action="store_true")
     parser.set_defaults(handler=handlers.Add)
     return parser
 
@@ -399,7 +385,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)
+    parser.set_defaults(handler=handlers.Patch, action=Action.List, architecture=[""], lock=None, report=False,
+                        unsafe=True)
     return parser
 
 
@@ -481,18 +468,18 @@ def _set_repo_check_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              formatter_class=_formatter)
     parser.add_argument("package", help="filter check by package base", nargs="*")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
-    parser.add_argument("--vcs", help="enable or disable checking of VCS packages",
+    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, "
                                                 "-yy to force refresh even if up to date",
                         action="count", default=False)
-    parser.set_defaults(handler=handlers.Update, 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)
     return parser
 
 
-def _set_repo_clean_parser(root: SubParserAction) -> argparse.ArgumentParser:
+def _set_repo_daemon_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
-    add parser for repository clean subcommand
+    add parser for daemon subcommand
 
     Args:
         root(SubParserAction): subparsers for the commands
@@ -500,39 +487,24 @@ def _set_repo_clean_parser(root: SubParserAction) -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: created argument parser
     """
-    parser = root.add_parser("repo-clean", aliases=["clean"], help="clean local caches",
-                             description="remove local caches",
-                             epilog="The subcommand clears every temporary directories (builds, caches etc). Normally "
-                                    "you should not run this command manually. Also in case if you are going to clear "
-                                    "the chroot directories you will need root privileges.",
+    parser = root.add_parser("repo-daemon", aliases=["daemon"], help="run application as daemon",
+                             description="start process which periodically will run update process",
                              formatter_class=_formatter)
-    parser.add_argument("--cache", help="clear directory with package caches",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--chroot", help="clear build chroot", action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--manual", help="clear manually added packages queue",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--packages", help="clear directory with built packages",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--pacman", help="clear directory with pacman local database cache",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.set_defaults(handler=handlers.Clean, quiet=True, unsafe=True)
-    return parser
-
-
-def _set_repo_config_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for config subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("repo-config", aliases=["config"], help="dump configuration",
-                             description="dump configuration for the specified architecture",
-                             formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Dump, lock=None, report=False, quiet=True, unsafe=True)
+    parser.add_argument("-i", "--interval", help="interval between runs in seconds", type=int, default=60 * 60 * 12)
+    parser.add_argument("--aur", help="enable or disable checking for AUR updates",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--dependencies", help="process missing package dependencies",
+                        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("--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, "
+                                                "-yy to force refresh even if up to date",
+                        action="count", default=False)
+    parser.set_defaults(handler=handlers.Daemon, dry_run=False, exit_code=False, package=[])
     return parser
 
 
@@ -616,39 +588,6 @@ def _set_repo_restore_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
-def _set_repo_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for setup subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("repo-setup", aliases=["init", "repo-init", "setup"], help="initial service configuration",
-                             description="create initial service configuration, requires root",
-                             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"))
-    parser.add_argument("--makeflags-jobs", help="append MAKEFLAGS variable with parallelism set to number of cores",
-                        action=argparse.BooleanOptionalAction, default=True)
-    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("--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)
-    return parser
-
-
 def _set_repo_sign_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for sign subcommand
@@ -718,7 +657,7 @@ 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)
+    parser.set_defaults(handler=handlers.Structure, lock=None, report=False, quiet=True, unsafe=True)
     return parser
 
 
@@ -755,15 +694,17 @@ def _set_repo_update_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="check for packages updates and run build process if requested",
                              formatter_class=_formatter)
     parser.add_argument("package", help="filter check by package base", nargs="*")
+    parser.add_argument("--aur", help="enable or disable checking for AUR updates",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--dependencies", help="process missing package dependencies",
+                        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("--aur", help="enable or disable checking for AUR updates. Implies --no-vcs",
-                        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("--vcs", help="enable or disable checking of VCS packages",
+    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, "
                                                 "-yy to force refresh even if up to date",
@@ -772,7 +713,133 @@ def _set_repo_update_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
-def _set_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
+def _set_service_clean_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for repository clean subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-clean", aliases=["clean", "repo-clean"], help="clean local caches",
+                             description="remove local caches",
+                             epilog="The subcommand clears every temporary directories (builds, caches etc). Normally "
+                                    "you should not run this command manually. Also in case if you are going to clear "
+                                    "the chroot directories you will need root privileges.",
+                             formatter_class=_formatter)
+    parser.add_argument("--cache", help="clear directory with package caches",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--chroot", help="clear build chroot", action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--manual", help="clear manually added packages queue",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--packages", help="clear directory with built packages",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--pacman", help="clear directory with pacman local database cache",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.set_defaults(handler=handlers.Clean, quiet=True, unsafe=True)
+    return parser
+
+
+def _set_service_config_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for config subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    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("--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)
+    return parser
+
+
+def _set_service_config_validate_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for config validation subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-config-validate", aliases=["config-validate", "repo-config-validate"],
+                             help="validate system configuration",
+                             description="validate configuration and print found errors",
+                             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)
+    return parser
+
+
+def _set_service_key_import_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for key import subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-key-import", aliases=["key-import"], help="import PGP key",
+                             description="import PGP key from public sources to the repository user",
+                             epilog="By default ahriman runs build process with package sources validation "
+                                    "(in case if signature and keys are available in PKGBUILD). This process will "
+                                    "fail in case if key is not known for build user. This subcommand can be used "
+                                    "in order to import the PGP key to user keychain.",
+                             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)
+    return parser
+
+
+def _set_service_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for setup subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-setup", aliases=["init", "repo-init", "repo-setup", "setup"],
+                             help="initial service configuration",
+                             description="create initial service configuration, requires root",
+                             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"))
+    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("--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)
+    return parser
+
+
+def _set_service_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for shell subcommand
 
@@ -782,7 +849,7 @@ def _set_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: created argument parser
     """
-    parser = root.add_parser("shell", help="invoke python shell",
+    parser = root.add_parser("service-shell", aliases=["shell"], help="invoke python shell",
                              description="drop into python shell while having created application",
                              formatter_class=_formatter)
     parser.add_argument("code", help="instead of dropping into shell, just execute the specified code", nargs="?")
@@ -814,7 +881,7 @@ def _set_user_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
                         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, unsafe=True)
+                        quiet=True)
     return parser
 
 
@@ -854,24 +921,7 @@ def _set_user_remove_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              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, unsafe=True)
-    return parser
-
-
-def _set_version_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for version subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("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)
+                        password="", quiet=True)
     return parser
 
 
@@ -886,7 +936,8 @@ 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=None, report=False, parser=_parser)
+    parser.set_defaults(handler=handlers.Web, lock=Path(tempfile.gettempdir()) / "ahriman-web.lock", report=False,
+                        parser=_parser)
     return parser
 
 

src/ahriman/application/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,10 +17,11 @@
 # 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 typing import Set
+from typing import Iterable, List, Set
 
 from ahriman.application.application.application_packages import ApplicationPackages
 from ahriman.application.application.application_repository import ApplicationRepository
+from ahriman.models.package import Package
 from ahriman.models.result import Result
 
 
@@ -87,3 +88,39 @@ class Application(ApplicationPackages, ApplicationRepository):
         directly as it will be called after on_start action
         """
         self.repository.triggers.on_stop()
+
+    def with_dependencies(self, packages: List[Package], *, process_dependencies: bool) -> List[Package]:
+        """
+        add missing dependencies to list of packages
+
+        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
+        """
+        def missing_dependencies(source: Iterable[Package]) -> Set[str]:
+            # build initial list of dependencies
+            result = set()
+            for package in source:
+                result.update(package.depends_build)
+
+            # 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
+
+        if not process_dependencies or not packages:
+            return packages
+
+        known_packages = self._known_packages()
+        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)
+                with_dependencies[package.base] = package
+
+        return list(with_dependencies.values())

src/ahriman/application/application/application_packages.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,8 +21,7 @@ import requests
 import shutil
 
 from pathlib import Path
-from tempfile import TemporaryDirectory
-from typing import Any, Iterable, Set
+from typing import Any, Iterable
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
@@ -37,30 +36,6 @@ class ApplicationPackages(ApplicationProperties):
     package control class
     """
 
-    def _known_packages(self) -> Set[str]:
-        """
-        load packages from repository and pacman repositories
-
-        Returns:
-            Set[str]: list of known packages
-
-        Raises:
-            NotImplementedError: not implemented method
-        """
-        raise NotImplementedError
-
-    def on_result(self, result: Result) -> None:
-        """
-        generate report and sync to remote server
-
-        Args:
-            result(Result): build result
-
-        Raises:
-            NotImplementedError: not implemented method
-        """
-        raise NotImplementedError
-
     def _add_archive(self, source: str, *_: Any) -> None:
         """
         add package from archive
@@ -72,24 +47,18 @@ class ApplicationPackages(ApplicationProperties):
         dst = self.repository.paths.packages / local_path.name
         shutil.copy(local_path, dst)
 
-    def _add_aur(self, source: str, known_packages: Set[str], without_dependencies: bool) -> None:
+    def _add_aur(self, source: str) -> None:
         """
         add package from AUR
 
         Args:
             source(str): package base name
-            known_packages(Set[str]): list of packages which are known by the service
-            without_dependencies(bool): if set, dependency check will be disabled
         """
         package = Package.from_aur(source, self.repository.pacman)
 
         self.database.build_queue_insert(package)
         self.database.remote_update(package)
 
-        with TemporaryDirectory(ignore_cleanup_errors=True) as dir_name, (local_dir := Path(dir_name)):
-            Sources.load(local_dir, package, self.database.patches_get(package.base), self.repository.paths)
-            self._process_dependencies(local_dir, known_packages, without_dependencies)
-
     def _add_directory(self, source: str, *_: Any) -> None:
         """
         add packages from directory
@@ -101,25 +70,21 @@ class ApplicationPackages(ApplicationProperties):
         for full_path in filter(package_like, local_dir.iterdir()):
             self._add_archive(str(full_path))
 
-    def _add_local(self, source: str, known_packages: Set[str], without_dependencies: bool) -> None:
+    def _add_local(self, source: str) -> None:
         """
         add package from local PKGBUILDs
 
         Args:
             source(str): path to directory with local source files
-            known_packages(Set[str]): list of packages which are known by the service
-            without_dependencies(bool): if set, dependency check will be disabled
         """
         source_dir = Path(source)
-        package = Package.from_build(source_dir)
+        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
 
         self.database.build_queue_insert(package)
 
-        self._process_dependencies(cache_dir, known_packages, without_dependencies)
-
     def _add_remote(self, source: str, *_: Any) -> None:
         """
         add package from remote sources (e.g. HTTP)
@@ -145,38 +110,31 @@ class ApplicationPackages(ApplicationProperties):
         package = Package.from_official(source, self.repository.pacman)
         self.database.build_queue_insert(package)
         self.database.remote_update(package)
-        # repository packages must not depend on unknown packages, thus we are not going to process dependencies
 
-    def _process_dependencies(self, local_dir: Path, known_packages: Set[str], without_dependencies: bool) -> None:
-        """
-        process package dependencies
-
-        Args:
-            local_dir(Path): path to local package sources (i.e. cloned AUR repository)
-            known_packages(Set[str]): list of packages which are known by the service
-            without_dependencies(bool): if set, dependency check will be disabled
-        """
-        if without_dependencies:
-            return
-
-        dependencies = Package.dependencies(local_dir)
-        self.add(dependencies.difference(known_packages), PackageSource.AUR, without_dependencies)
-
-    def add(self, names: Iterable[str], source: PackageSource, without_dependencies: bool) -> None:
+    def add(self, names: Iterable[str], source: PackageSource) -> None:
         """
         add packages for the next build
 
         Args:
             names(Iterable[str]): list of package bases to add
             source(PackageSource): package source to add
-            without_dependencies(bool): if set, dependency check will be disabled
         """
-        known_packages = self._known_packages()  # speedup dependencies processing
-
         for name in names:
             resolved_source = source.resolve(name)
             fn = getattr(self, f"_add_{resolved_source.value}")
-            fn(name, known_packages, without_dependencies)
+            fn(name)
+
+    def on_result(self, result: Result) -> None:
+        """
+        generate report and sync to remote server
+
+        Args:
+            result(Result): build result
+
+        Raises:
+            NotImplementedError: not implemented method
+        """
+        raise NotImplementedError
 
     def remove(self, names: Iterable[str]) -> None:
         """

src/ahriman/application/application/application_properties.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application_repository.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -33,18 +33,6 @@ class ApplicationRepository(ApplicationProperties):
     repository control class
     """
 
-    def on_result(self, result: Result) -> None:
-        """
-        generate report and sync to remote server
-
-        Args:
-            result(Result): build result
-
-        Raises:
-            NotImplementedError: not implemented method
-        """
-        raise NotImplementedError
-
     def clean(self, *, cache: bool, chroot: bool, manual: bool, packages: bool, pacman: bool) -> None:
         """
         run all clean methods. Warning: some functions might not be available under non-root
@@ -67,6 +55,18 @@ class ApplicationRepository(ApplicationProperties):
         if pacman:
             self.repository.clear_pacman()
 
+    def on_result(self, result: Result) -> None:
+        """
+        generate report and sync to remote server
+
+        Args:
+            result(Result): build result
+
+        Raises:
+            NotImplementedError: not implemented method
+        """
+        raise NotImplementedError
+
     def sign(self, packages: Iterable[str]) -> None:
         """
         sign packages and repository
@@ -111,7 +111,7 @@ class ApplicationRepository(ApplicationProperties):
 
         def unknown_local(probe: Package) -> List[str]:
             cache_dir = self.repository.paths.cache_for(probe.base)
-            local = Package.from_build(cache_dir)
+            local = Package.from_build(cache_dir, self.architecture)
             packages = set(probe.packages.keys()).difference(local.packages.keys())
             return list(packages)
 
@@ -145,7 +145,7 @@ class ApplicationRepository(ApplicationProperties):
         process_update(packages, build_result)
 
         # process manual packages
-        tree = Tree.resolve(updates, self.repository.paths, self.database)
+        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)
@@ -175,7 +175,7 @@ class ApplicationRepository(ApplicationProperties):
         if aur:
             updates.update({package.base: package for package in self.repository.updates_aur(filter_packages, vcs=vcs)})
         if local:
-            updates.update({package.base: package for package in self.repository.updates_local()})
+            updates.update({package.base: package for package in self.repository.updates_local(vcs=vcs)})
         if manual:
             updates.update({package.base: package for package in self.repository.updates_manual()})
 
@@ -183,7 +183,7 @@ class ApplicationRepository(ApplicationProperties):
         updated_packages = [package for _, package in sorted(updates.items())]
 
         # reorder updates according to the dependency tree
-        tree = Tree.resolve(updated_packages, self.repository.paths, self.database)
+        tree = Tree.resolve(updated_packages)
         for level in tree:
             for package in level:
                 UpdatePrinter(package, local_versions.get(package.base)).print(

src/ahriman/application/handlers/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -32,6 +32,7 @@ from ahriman.application.handlers.remove import Remove
 from ahriman.application.handlers.remove_unknown import RemoveUnknown
 from ahriman.application.handlers.restore import Restore
 from ahriman.application.handlers.search import Search
+from ahriman.application.handlers.service_updates import ServiceUpdates
 from ahriman.application.handlers.setup import Setup
 from ahriman.application.handlers.shell import Shell
 from ahriman.application.handlers.sign import Sign
@@ -42,5 +43,6 @@ from ahriman.application.handlers.triggers import Triggers
 from ahriman.application.handlers.unsafe_commands import UnsafeCommands
 from ahriman.application.handlers.update import Update
 from ahriman.application.handlers.users import Users
+from ahriman.application.handlers.validate import Validate
 from ahriman.application.handlers.versions import Versions
 from ahriman.application.handlers.web import Web

src/ahriman/application/handlers/add.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -47,11 +47,12 @@ class Add(Handler):
         application = Application(architecture, configuration,
                                   report=report, unsafe=unsafe, refresh_pacman_database=args.refresh)
         application.on_start()
-        application.add(args.package, args.source, args.without_dependencies)
+        application.add(args.package, args.source)
         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.with_dependencies(packages, process_dependencies=args.dependencies)
         result = application.update(packages)
         Add.check_if_empty(args.exit_code, result.is_empty)

src/ahriman/application/handlers/backup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/clean.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/daemon.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/dump.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -48,4 +48,4 @@ class Dump(Handler):
         """
         dump = configuration.dump()
         for section, values in sorted(dump.items()):
-            ConfigurationPrinter(section, values).print(verbose=False, separator=" = ")
+            ConfigurationPrinter(section, values).print(verbose=not args.secure, separator=" = ")

src/ahriman/application/handlers/handler.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/help.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/key_import.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/patch.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -58,7 +58,7 @@ class Patch(Handler):
             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, args.track)
+            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)
@@ -66,19 +66,20 @@ class Patch(Handler):
             Patch.patch_set_remove(application, args.package, args.variable)
 
     @staticmethod
-    def patch_create_from_diff(sources_dir: Path, track: List[str]) -> Tuple[str, PkgbuildPatch]:
+    def patch_create_from_diff(sources_dir: Path, architecture: str, track: List[str]) -> Tuple[str, PkgbuildPatch]:
         """
         create PKGBUILD plain diff patches from sources directory
 
         Args:
             sources_dir(Path): path to directory with the package sources
+            architecture(str): repository architecture
             track(List[str]): track files which match the glob before creating the patch
 
         Returns:
             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)
+        package = Package.from_build(sources_dir, architecture)
         patch = Sources.patch_create(sources_dir, *track)
         return package.base, PkgbuildPatch(None, patch)
 

src/ahriman/application/handlers/rebuild.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/remove.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/remove_unknown.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -51,7 +51,7 @@ class RemoveUnknown(Handler):
 
         if args.dry_run:
             for package in sorted(unknown_packages):
-                StringPrinter(package).print(False)
+                StringPrinter(package).print(verbose=False)
             return
 
         application.remove(unknown_packages)

src/ahriman/application/handlers/restore.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/search.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -40,7 +40,7 @@ class Search(Handler):
     """
 
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
-    SORT_FIELDS = {field.name for field in fields(AURPackage) if field.default_factory is not list}
+    SORT_FIELDS = {field.name for field in fields(AURPackage) if field.default_factory is not list}  # type: ignore
 
     @classmethod
     def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
@@ -64,7 +64,7 @@ class Search(Handler):
         for packages_list in (official_packages_list, aur_packages_list):
             # keep sorting by packages source
             for package in Search.sort(packages_list, args.sort_by):
-                AurPrinter(package).print(args.info)
+                AurPrinter(package).print(verbose=args.info)
 
     @staticmethod
     def sort(packages: Iterable[AURPackage], sort_by: str) -> List[AURPackage]:

src/ahriman/application/handlers/service_updates.py

@@ -0,0 +1,65 @@
+#
+# 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 typing import Type
+
+from ahriman import version
+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.package import Package
+
+
+class ServiceUpdates(Handler):
+    """
+    service updates handler
+    """
+
+    ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+
+    @classmethod
+    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+            report: bool, unsafe: bool) -> None:
+        """
+        callback for command line
+
+        Args:
+            args(argparse.Namespace): command line args
+            architecture(str): repository architecture
+            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)
+
+        remote = Package.from_aur("ahriman", application.repository.pacman)
+        release = remote.version.rsplit("-", 1)[-1]  # we don't store pkgrel locally, so we just append it
+        local_version = f"{version.__version__}-{release}"
+
+        # technically we would like to compare versions, but it is fine to raise an exception in case if locally
+        # installed package is newer than in AUR
+        same_version = remote.version == local_version
+        if same_version:
+            return
+
+        UpdatePrinter(remote, local_version).print(verbose=True, separator=" -> ")
+        ServiceUpdates.check_if_empty(args.exit_code, not same_version)

src/ahriman/application/handlers/setup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,7 @@ import argparse
 
 from pathlib import Path
 from pwd import getpwuid
-from typing import Type
+from typing import Optional, Type
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -58,19 +58,20 @@ class Setup(Handler):
             report(bool): force enable or disable reporting
             unsafe(bool): if set no user check will be performed before path creation
         """
-        Setup.configuration_create_ahriman(args, architecture, args.repository, configuration.include,
-                                           configuration.repository_paths)
+        Setup.configuration_create_ahriman(args, architecture, args.repository, configuration)
         configuration.reload()
 
         application = Application(architecture, configuration, report=report, unsafe=unsafe)
 
         Setup.configuration_create_makepkg(args.packager, args.makeflags_jobs, application.repository.paths)
         Setup.executable_create(application.repository.paths, args.build_command, architecture)
-        Setup.configuration_create_devtools(args.build_command, architecture, args.from_configuration,
+        Setup.configuration_create_devtools(args.build_command, architecture, args.from_configuration, args.mirror,
                                             args.multilib, args.repository, application.repository.paths)
         Setup.configuration_create_sudo(application.repository.paths, args.build_command, architecture)
 
         application.repository.repo.init()
+        # lazy database sync
+        application.repository.pacman.handle  # pylint: disable=pointless-statement
 
     @staticmethod
     def build_command(root: Path, prefix: str, architecture: str) -> Path:
@@ -78,7 +79,7 @@ class Setup(Handler):
         generate build command name
 
         Args:
-            root(Path): root directory for the build command (must be root of the reporitory)
+            root(Path): root directory for the build command (must be root of the repository)
             prefix(str): command prefix in {prefix}-{architecture}-build
             architecture(str): repository architecture
 
@@ -89,7 +90,7 @@ class Setup(Handler):
 
     @staticmethod
     def configuration_create_ahriman(args: argparse.Namespace, architecture: str, repository: str,
-                                     include_path: Path, paths: RepositoryPaths) -> None:
+                                     root: Configuration) -> None:
         """
         create service specific configuration
 
@@ -97,37 +98,41 @@ class Setup(Handler):
             args(argparse.Namespace): command line args
             architecture(str): repository architecture
             repository(str): repository name
-            include_path(Path): path to directory with configuration includes
-            paths(RepositoryPaths): repository paths instance
+            root(Configuration): root configuration instance
         """
         configuration = Configuration()
 
         section = Configuration.section_name("build", architecture)
-        build_command = Setup.build_command(paths.root, args.build_command, architecture)
+        build_command = Setup.build_command(root.repository_paths.root, args.build_command, architecture)
         configuration.set_option(section, "build_command", str(build_command))
         configuration.set_option("repository", "name", repository)
         if args.build_as_user is not None:
             configuration.set_option(section, "makechrootpkg_flags", f"-U {args.build_as_user}")
 
-        if args.sign_key is not None:
+        section = Configuration.section_name("alpm", architecture)
+        if args.mirror is not None:
+            configuration.set_option(section, "mirror", args.mirror)
+        if not args.multilib:
+            repositories = filter(lambda r: r != "multilib", root.getlist("alpm", "repositories"))
+            configuration.set_option(section, "repositories", " ".join(repositories))
+
         section = Configuration.section_name("sign", architecture)
+        if args.sign_key is not None:
             configuration.set_option(section, "target", " ".join([target.name.lower() for target in args.sign_target]))
             configuration.set_option(section, "key", args.sign_key)
 
+        section = Configuration.section_name("web", architecture)
         if args.web_port is not None:
-            section = Configuration.section_name("web", architecture)
             configuration.set_option(section, "port", str(args.web_port))
-
         if args.web_unix_socket is not None:
-            section = Configuration.section_name("web", architecture)
             configuration.set_option(section, "unix_socket", str(args.web_unix_socket))
 
-        target = include_path / "00-setup-overrides.ini"
+        target = root.include / "00-setup-overrides.ini"
         with target.open("w") as ahriman_configuration:
             configuration.write(ahriman_configuration)
 
     @staticmethod
-    def configuration_create_devtools(prefix: str, architecture: str, source: Path,
+    def configuration_create_devtools(prefix: str, architecture: str, source: Path, mirror: Optional[str],
                                       multilib: bool, repository: str, paths: RepositoryPaths) -> None:
         """
         create configuration for devtools based on ``source`` configuration
@@ -139,6 +144,7 @@ class Setup(Handler):
             prefix(str): command prefix in {prefix}-{architecture}-build
             architecture(str): repository architecture
             source(Path): path to source configuration file
+            mirror(Optional[str]): link to package server mirror
             multilib(bool): add or do not multilib repository to the configuration
             repository(str): repository name
             paths(RepositoryPaths): repository paths instance
@@ -161,6 +167,14 @@ class Setup(Handler):
         if multilib:
             configuration.set_option("multilib", "Include", str(Setup.MIRRORLIST_PATH))
 
+        # override Include option to Server in case if mirror option set
+        if mirror is not None:
+            for section in filter(lambda s: s != "options", configuration.sections()):
+                if configuration.get(section, "Include", fallback=None) != str(Setup.MIRRORLIST_PATH):
+                    continue
+                configuration.remove_option(section, "Include")
+                configuration.set_option(section, "Server", mirror)
+
         # add repository itself
         configuration.set_option(repository, "SigLevel", "Optional TrustAll")  # we don't care
         configuration.set_option(repository, "Server", f"file://{paths.repository}")

src/ahriman/application/handlers/shell.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/sign.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/status.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -53,7 +53,7 @@ class Status(Handler):
         client = Application(architecture, configuration, report=True, unsafe=unsafe).repository.reporter
         if args.ahriman:
             service_status = client.get_internal()
-            StatusPrinter(service_status.status).print(args.info)
+            StatusPrinter(service_status.status).print(verbose=args.info)
         if args.package:
             packages: Iterable[Tuple[Package, BuildStatus]] = sum(
                 (client.get(base) for base in args.package),
@@ -67,4 +67,4 @@ class Status(Handler):
         filter_fn: Callable[[Tuple[Package, BuildStatus]], bool] =\
             lambda item: args.status is None or item[1].status == args.status
         for package, package_status in sorted(filter(filter_fn, packages), key=comparator):
-            PackagePrinter(package, package_status).print(args.info)
+            PackagePrinter(package, package_status).print(verbose=args.info)

src/ahriman/application/handlers/status_update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/structure.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -51,6 +51,6 @@ class Structure(Handler):
         application = Application(architecture, configuration, report=report, unsafe=unsafe)
         packages = application.repository.packages()
 
-        tree = Tree.resolve(packages, application.repository.paths, application.database)
+        tree = Tree.resolve(packages)
         for num, level in enumerate(tree):
             TreePrinter(num, level).print(verbose=True, separator=" ")

src/ahriman/application/handlers/triggers.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -48,6 +48,6 @@ class Triggers(Handler):
         application = Application(architecture, configuration, report=report, unsafe=unsafe)
         if args.trigger:
             loader = application.repository.triggers
-            loader.triggers = [loader.load_trigger(trigger) for trigger in args.trigger]
+            loader.triggers = [loader.load_trigger(trigger, architecture, configuration) for trigger in args.trigger]
         application.on_start()
         application.on_result(Result())

src/ahriman/application/handlers/unsafe_commands.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -82,4 +82,4 @@ class UnsafeCommands(Handler):
         # should never fail
         # pylint: disable=protected-access
         subparser = next(action for action in parser._actions if isinstance(action, argparse._SubParsersAction))
-        return [action_name for action_name, action in subparser.choices.items() if action.get_default("unsafe")]
+        return sorted(action_name for action_name, action in subparser.choices.items() if action.get_default("unsafe"))

src/ahriman/application/handlers/update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -53,6 +53,7 @@ class Update(Handler):
         if args.dry_run:
             return
 
+        packages = application.with_dependencies(packages, process_dependencies=args.dependencies)
         result = application.update(packages)
         Update.check_if_empty(args.exit_code, result.is_empty)
 

src/ahriman/application/handlers/users.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/validate.py

@@ -0,0 +1,135 @@
+#
+# 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
+import copy
+
+from typing import Any, Dict, Type
+
+from ahriman.application.handlers import Handler
+from ahriman.core.configuration import Configuration
+from ahriman.core.configuration.schema import CONFIGURATION_SCHEMA, ConfigurationSchema
+from ahriman.core.configuration.validator import Validator
+from ahriman.core.exceptions import ExtensionError
+from ahriman.core.formatters import ValidationPrinter
+from ahriman.core.triggers import TriggerLoader
+
+
+class Validate(Handler):
+    """
+    configuration validator handler
+    """
+
+    ALLOW_AUTO_ARCHITECTURE_RUN = False
+
+    @classmethod
+    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+            report: bool, unsafe: bool) -> None:
+        """
+        callback for command line
+
+        Args:
+            args(argparse.Namespace): command line args
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+            report(bool): force enable or disable reporting
+            unsafe(bool): if set no user check will be performed before path creation
+        """
+        schema = Validate.schema(architecture, configuration)
+        validator = Validator(configuration=configuration, schema=schema)
+
+        if validator.validate(configuration.dump()):
+            return  # no errors found
+        for node, errors in validator.errors.items():
+            ValidationPrinter(node, errors).print(verbose=True)
+
+        # as we reach this part it means that we always have errors
+        Validate.check_if_empty(args.exit_code, True)
+
+    @staticmethod
+    def schema(architecture: str, configuration: Configuration) -> ConfigurationSchema:
+        """
+        get schema with triggers
+
+        Args:
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+
+        Returns:
+            ConfigurationSchema: configuration validation schema
+        """
+        root = copy.deepcopy(CONFIGURATION_SCHEMA)
+
+        # create trigger loader instance
+        loader = TriggerLoader()
+        for trigger in loader.selected_triggers(configuration):
+            try:
+                trigger_class = loader.load_trigger_class(trigger)
+            except ExtensionError:
+                continue
+
+            # default settings if any
+            for schema_name, schema in trigger_class.configuration_schema(architecture, None).items():
+                erased = Validate.schema_erase_required(copy.deepcopy(schema))
+                root[schema_name] = Validate.schema_merge(root.get(schema_name, {}), erased)
+
+            # settings according to enabled triggers
+            for schema_name, schema in trigger_class.configuration_schema(architecture, configuration).items():
+                root[schema_name] = Validate.schema_merge(root.get(schema_name, {}), copy.deepcopy(schema))
+
+        return root
+
+    @staticmethod
+    def schema_erase_required(schema: ConfigurationSchema) -> ConfigurationSchema:
+        """
+        recursively remove required field from supplied cerberus schema
+
+        Args:
+            schema(ConfigurationSchema): source schema from which required field must be removed
+
+        Returns:
+            ConfigurationSchema: schema without required fields. Note, that source schema will be modified in-place
+        """
+        schema.pop("required", None)
+        for value in filter(lambda v: isinstance(v, dict), schema.values()):
+            Validate.schema_erase_required(value)
+        return schema
+
+    @staticmethod
+    def schema_merge(source: Dict[str, Any], schema: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        merge child schema into source. In case if source already contains values, new keys will be added
+            (possibly with overrides - in case if such key already set also)
+
+        Args:
+            source(Dict[str, Any]): source (current) schema into which will be merged
+            schema(Dict[str, Any]): new schema to be merged
+
+        Returns:
+            Dict[str, Any]: schema with added elements from source schema if they were set before and not presented
+                in the new one. Note, that schema will be modified in-place
+        """
+        for key, value in source.items():
+            if key not in schema:
+                schema[key] = value  # new key found, just add it as is
+            elif isinstance(value, dict):
+                # value is dictionary, so we need to go deeper
+                Validate.schema_merge(value, schema[key])
+
+        return schema

src/ahriman/application/handlers/versions.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -61,7 +61,7 @@ class Versions(Handler):
 
         Args:
             root(str): root package name
-            root_extras(Tuple[str, ...]): extras for the root package (Default value = ())
+            root_extras(Tuple[str, ...], optional): extras for the root package (Default value = ())
 
         Returns:
             Dict[str, str]: map of installed dependency to its version

src/ahriman/application/handlers/web.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -55,3 +55,7 @@ class Web(Handler):
 
         application = setup_service(architecture, configuration, spawner)
         run_server(application)
+
+        # terminate spawn process at the last
+        spawner.stop()
+        spawner.join()

src/ahriman/application/lock.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,6 @@ from __future__ import annotations
 
 import argparse
 
-from pathlib import Path
 from types import TracebackType
 from typing import Literal, Optional, Type
 
@@ -68,47 +67,13 @@ class Lock(LazyLogging):
             architecture(str): repository architecture
             configuration(Configuration): configuration instance
         """
-        self.path = Path(f"{args.lock}_{architecture}") if args.lock is not None else None
+        self.path = args.lock.with_stem(f"{args.lock.stem}_{architecture}") if args.lock is not None else None
         self.force = args.force
         self.unsafe = args.unsafe
 
         self.paths = configuration.repository_paths
         self.reporter = Client.load(configuration, report=args.report)
 
-    def __enter__(self) -> Lock:
-        """
-        default workflow is the following:
-
-            1. Check user UID
-            2. Check if there is lock file
-            3. Check web status watcher status
-            4. Create lock file
-            5. Report to status page if enabled
-        """
-        self.check_user()
-        self.check_version()
-        self.create()
-        self.reporter.update_self(BuildStatusEnum.Building)
-        return self
-
-    def __exit__(self, exc_type: Optional[Type[Exception]], exc_val: Optional[Exception],
-                 exc_tb: TracebackType) -> Literal[False]:
-        """
-        remove lock file when done
-
-        Args:
-            exc_type(Optional[Type[Exception]]): exception type name if any
-            exc_val(Optional[Exception]): exception raised if any
-            exc_tb(TracebackType): exception traceback if any
-
-        Returns:
-            Literal[False]: always False (do not suppress any exception)
-        """
-        self.clear()
-        status = BuildStatusEnum.Success if exc_val is None else BuildStatusEnum.Failed
-        self.reporter.update_self(status)
-        return False
-
     def check_version(self) -> None:
         """
         check web server version
@@ -145,3 +110,37 @@ class Lock(LazyLogging):
             self.path.touch(exist_ok=self.force)
         except FileExistsError:
             raise DuplicateRunError()
+
+    def __enter__(self) -> Lock:
+        """
+        default workflow is the following:
+
+            1. Check user UID
+            2. Check if there is lock file
+            3. Check web status watcher status
+            4. Create lock file
+            5. Report to status page if enabled
+        """
+        self.check_user()
+        self.check_version()
+        self.create()
+        self.reporter.update_self(BuildStatusEnum.Building)
+        return self
+
+    def __exit__(self, exc_type: Optional[Type[Exception]], exc_val: Optional[Exception],
+                 exc_tb: TracebackType) -> Literal[False]:
+        """
+        remove lock file when done
+
+        Args:
+            exc_type(Optional[Type[Exception]]): exception type name if any
+            exc_val(Optional[Exception]): exception raised if any
+            exc_tb(TracebackType): exception traceback if any
+
+        Returns:
+            Literal[False]: always False (do not suppress any exception)
+        """
+        self.clear()
+        status = BuildStatusEnum.Success if exc_val is None else BuildStatusEnum.Failed
+        self.reporter.update_self(status)
+        return False

src/ahriman/core/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/pacman.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,10 +21,11 @@ import shutil
 
 from pathlib import Path
 from pyalpm import DB, Handle, Package, SIG_PACKAGE, error as PyalpmError  # type: ignore
-from typing import Generator, Set
+from typing import Any, Callable, Generator, Set
 
 from ahriman.core.configuration import Configuration
 from ahriman.core.log import LazyLogging
+from ahriman.core.util import trim_package
 from ahriman.models.repository_paths import RepositoryPaths
 
 
@@ -36,6 +37,8 @@ class Pacman(LazyLogging):
         handle(Handle): pyalpm root ``Handle``
     """
 
+    handle: Handle
+
     def __init__(self, architecture: str, configuration: Configuration, *, refresh_database: int) -> None:
         """
         default constructor
@@ -43,8 +46,24 @@ class Pacman(LazyLogging):
         Args:
             architecture(str): repository architecture
             configuration(Configuration): configuration instance
-            refresh_database(int): synchronize local cache to remote. If set to ``0``, no syncronization will be
-                enabled, if set to ``1`` - normal syncronization, if set to ``2`` - force syncronization
+            refresh_database(int): synchronize local cache to remote. If set to ``0``, no synchronization will be
+                enabled, if set to ``1`` - normal synchronization, if set to ``2`` - force synchronization
+        """
+        self.__create_handle_fn: Callable[[], Handle] = lambda: self.__create_handle(
+            architecture, configuration, refresh_database=refresh_database)
+
+    def __create_handle(self, architecture: str, configuration: Configuration, *, refresh_database: int) -> Handle:
+        """
+        create lazy handle function
+
+        Args:
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+            refresh_database(int): synchronize local cache to remote. If set to ``0``, no synchronization will be
+                enabled, if set to ``1`` - normal synchronization, if set to ``2`` - force synchronization
+
+        Returns:
+            Handle: fully initialized pacman handle
         """
         root = configuration.getpath("alpm", "root")
         pacman_root = configuration.getpath("alpm", "database")
@@ -53,20 +72,23 @@ class Pacman(LazyLogging):
         paths = configuration.repository_paths
         database_path = paths.pacman if use_ahriman_cache else pacman_root
 
-        self.handle = Handle(str(root), str(database_path))
+        handle = Handle(str(root), str(database_path))
         for repository in configuration.getlist("alpm", "repositories"):
-            database = self.database_init(repository, mirror, architecture)
-            self.database_copy(database, pacman_root, paths, use_ahriman_cache=use_ahriman_cache)
+            database = self.database_init(handle, repository, mirror, architecture)
+            self.database_copy(handle, database, pacman_root, paths, use_ahriman_cache=use_ahriman_cache)
 
         if use_ahriman_cache and refresh_database:
-            self.database_sync(refresh_database > 1)
+            self.database_sync(handle, force=refresh_database > 1)
 
-    def database_copy(self, database: DB, pacman_root: Path, paths: RepositoryPaths, *,
+        return handle
+
+    def database_copy(self, handle: Handle, database: DB, pacman_root: Path, paths: RepositoryPaths, *,
                       use_ahriman_cache: bool) -> None:
         """
         copy database from the operating system root to the ahriman local home
 
         Args:
+            handle(Handle): pacman handle which will be used for database copying
             database(DB): pacman database instance to be copied
             pacman_root(Path): operating system pacman root
             paths(RepositoryPaths): repository paths instance
@@ -78,7 +100,7 @@ class Pacman(LazyLogging):
         if not use_ahriman_cache:
             return
         # copy root database if no local copy found
-        pacman_db_path = Path(self.handle.dbpath)
+        pacman_db_path = Path(handle.dbpath)
         if not pacman_db_path.is_dir():
             return  # root directory does not exist yet
         dst = repository_database(pacman_db_path)
@@ -92,11 +114,12 @@ class Pacman(LazyLogging):
         shutil.copy(src, dst)
         paths.chown(dst)
 
-    def database_init(self, repository: str, mirror: str, architecture: str) -> DB:
+    def database_init(self, handle: Handle, repository: str, mirror: str, architecture: str) -> DB:
         """
         create database instance from pacman handler and set its properties
 
         Args:
+            handle(Handle): pacman handle which will be used for database initializing
             repository(str): pacman repository name (e.g. core)
             mirror(str): arch linux mirror url
             architecture(str): repository architecture
@@ -104,21 +127,23 @@ class Pacman(LazyLogging):
         Returns:
             DB: loaded pacman database instance
         """
-        database: DB = self.handle.register_syncdb(repository, SIG_PACKAGE)
+        self.logger.info("loading pacman database %s", repository)
+        database: DB = handle.register_syncdb(repository, SIG_PACKAGE)
         # replace variables in mirror address
         database.servers = [mirror.replace("$repo", repository).replace("$arch", architecture)]
         return database
 
-    def database_sync(self, force: bool) -> None:
+    def database_sync(self, handle: Handle, *, force: bool) -> None:
         """
         sync local database
 
         Args:
-            force(bool): force database syncronization (same as ``pacman -Syy``)
+            handle(Handle): pacman handle which will be used for database sync
+            force(bool): force database synchronization (same as ``pacman -Syy``)
         """
         self.logger.info("refresh ahriman's home pacman database (force refresh %s)", force)
-        transaction = self.handle.init_transaction()
-        for database in self.handle.get_syncdbs():
+        transaction = handle.init_transaction()
+        for database in handle.get_syncdbs():
             try:
                 database.update(force)
             except PyalpmError:
@@ -151,7 +176,28 @@ class Pacman(LazyLogging):
         result: Set[str] = set()
         for database in self.handle.get_syncdbs():
             for package in database.pkgcache:
-                result.add(package.name)  # package itself
-                result.update(package.provides)  # provides list for meta-packages
+                # package itself
+                result.add(package.name)
+                # provides list for meta-packages
+                result.update(trim_package(provides) for provides in package.provides)
 
         return result
+
+    def __getattr__(self, item: str) -> Any:
+        """
+        pacman handle extractor
+
+        Args:
+            item(str): property name
+
+        Returns:
+            Any: attribute by its name
+
+        Raises:
+            AttributeError: in case if no such attribute found
+        """
+        if item == "handle":
+            handle = self.__create_handle_fn()
+            setattr(self, item, handle)
+            return handle
+        return super().__getattr__(item)  # required for logging attribute

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/alpm/repo.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -18,6 +18,3 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from ahriman.core.auth.auth import Auth
-
-from ahriman.core.auth.mapping import Mapping
-from ahriman.core.auth.oauth import OAuth

src/ahriman/core/auth/auth.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -78,10 +78,10 @@ class Auth(LazyLogging):
         """
         provider = AuthSettings.from_option(configuration.get("auth", "target", fallback="disabled"))
         if provider == AuthSettings.Configuration:
-            from ahriman.core.auth import Mapping
+            from ahriman.core.auth.mapping import Mapping
             return Mapping(configuration, database)
         if provider == AuthSettings.OAuth:
-            from ahriman.core.auth import OAuth
+            from ahriman.core.auth.oauth import OAuth
             return OAuth(configuration, database)
         return cls(configuration)
 

src/ahriman/core/auth/helpers.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/mapping.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/auth/oauth.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,7 @@ import aioauth_client
 
 from typing import Optional, Type
 
-from ahriman.core.auth import Mapping
+from ahriman.core.auth.mapping import Mapping
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.exceptions import OptionError

src/ahriman/core/build_tools/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/build_tools/sources.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/build_tools/task.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/configuration/__init__.py

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2021-2023 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from ahriman.core.configuration.configuration import Configuration

src/ahriman/core/configuration/configuration.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -24,7 +24,7 @@ import shlex
 import sys
 
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple, Type
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type
 
 from ahriman.core.exceptions import InitializeError
 from ahriman.models.repository_paths import RepositoryPaths
@@ -56,13 +56,14 @@ class Configuration(configparser.RawConfigParser):
         architecture according to the merge rules. Moreover, the architecture names will be removed from section names.
 
         In order to get current settings, the ``check_loaded`` method can be used. This method will raise an
-        ``InitializeException`` in case if configuration was not yet loaded::
+        ``InitializeError`` in case if configuration was not yet loaded::
 
             >>> path, architecture = configuration.check_loaded()
     """
 
-    ARCHITECTURE_SPECIFIC_SECTIONS = ["build", "sign", "web"]
+    ARCHITECTURE_SPECIFIC_SECTIONS = ["alpm", "build", "sign", "web"]
     SYSTEM_CONFIGURATION_PATH = Path(sys.prefix) / "share" / "ahriman" / "settings" / "ahriman.ini"
+    converters: Dict[str, Callable[[str], Any]]  # typing guard
 
     def __init__(self, allow_no_value: bool = False) -> None:
         """
@@ -74,7 +75,7 @@ class Configuration(configparser.RawConfigParser):
         """
         configparser.RawConfigParser.__init__(self, allow_no_value=allow_no_value, converters={
             "list": shlex.split,
-            "path": self.__convert_path,
+            "path": self._convert_path,
         })
         self.architecture: Optional[str] = None
         self.path: Optional[Path] = None
@@ -141,7 +142,7 @@ class Configuration(configparser.RawConfigParser):
         """
         return f"{section}:{suffix}"
 
-    def __convert_path(self, value: str) -> Path:
+    def _convert_path(self, value: str) -> Path:
         """
         convert string value to path object
 
@@ -164,7 +165,7 @@ class Configuration(configparser.RawConfigParser):
             Tuple[Path, str]: configuration root path and architecture if loaded
 
         Raises:
-            InitializeException: in case if architecture and/or path are not set
+            InitializeError: in case if architecture and/or path are not set
         """
         if self.path is None or self.architecture is None:
             raise InitializeError("Configuration path and/or architecture are not set")
@@ -188,7 +189,7 @@ class Configuration(configparser.RawConfigParser):
 
     def getpath(self, *args: Any, **kwargs: Any) -> Path: ...  # type: ignore
 
-    def gettype(self, section: str, architecture: str) -> Tuple[str, str]:
+    def gettype(self, section: str, architecture: str, *, fallback: Optional[str] = None) -> Tuple[str, str]:
         """
         get type variable with fallback to old logic. Despite the fact that it has same semantics as other get* methods,
         but it has different argument list
@@ -196,6 +197,8 @@ class Configuration(configparser.RawConfigParser):
         Args:
             section(str): section name
             architecture(str): repository architecture
+            fallback(Optional[str], optional): optional fallback type if any. If set, second element of the tuple will
+                be always set to this value (Default value = None)
 
         Returns:
             Tuple[str, str]: section name and found type name
@@ -203,9 +206,8 @@ class Configuration(configparser.RawConfigParser):
         Raises:
             configparser.NoSectionError: in case if no section found
         """
-        group_type = self.get(section, "type", fallback=None)  # new-style logic
-        if group_type is not None:
-            return section, group_type
+        if (group_type := self.get(section, "type", fallback=fallback)) is not None:
+            return section, group_type  # new-style logic
         # okay lets check for the section with architecture name
         full_section = self.section_name(section, architecture)
         if self.has_section(full_section):
@@ -273,14 +275,14 @@ class Configuration(configparser.RawConfigParser):
         self.load(path)
         self.merge_sections(architecture)
 
-    def set_option(self, section: str, option: str, value: Optional[str]) -> None:
+    def set_option(self, section: str, option: str, value: str) -> None:
         """
         set option. Unlike default ``configparser.RawConfigParser.set`` it also creates section if it does not exist
 
         Args:
             section(str): section name
             option(str): option name
-            value(Optional[str]): option value as string in parsable format
+            value(str): option value as string in parsable format
         """
         if not self.has_section(section):
             self.add_section(section)

src/ahriman/core/configuration/schema.py

@@ -0,0 +1,269 @@
+#
+# Copyright (c) 2021-2023 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from typing import Any, Dict
+
+
+__all__ = ["CONFIGURATION_SCHEMA", "ConfigurationSchema"]
+
+
+ConfigurationSchema = Dict[str, Dict[str, Any]]
+
+
+CONFIGURATION_SCHEMA: ConfigurationSchema = {
+    "settings": {
+        "type": "dict",
+        "schema": {
+            "include": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+                "path_exists": True,
+            },
+            "database": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+            },
+            "logging": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+                "path_exists": True,
+            },
+            "suppress_http_log_errors": {
+                "type": "boolean",
+                "coerce": "boolean",
+            }
+        },
+    },
+    "alpm": {
+        "type": "dict",
+        "schema": {
+            "database": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+            },
+            "mirror": {
+                "type": "string",
+                "required": True,
+                "is_url": [],
+            },
+            "repositories": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+                "required": True,
+                "empty": False,
+            },
+            "root": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+                "path_exists": True,
+            },
+            "use_ahriman_cache": {
+                "type": "boolean",
+                "coerce": "boolean",
+                "required": True,
+            },
+        },
+    },
+    "auth": {
+        "type": "dict",
+        "schema": {
+            "target": {
+                "type": "string",
+                "oneof": [
+                    {"allowed": ["disabled"]},
+                    {"allowed": ["configuration", "mapping"], "dependencies": ["salt"]},
+                    {"allowed": ["oauth"], "dependencies": [
+                        "client_id", "client_secret", "oauth_provider", "oauth_scopes", "salt"
+                    ]},
+                ],
+            },
+            "allow_read_only": {
+                "type": "boolean",
+                "coerce": "boolean",
+                "required": True,
+            },
+            "client_id": {
+                "type": "string",
+            },
+            "client_secret": {
+                "type": "string",
+            },
+            "cookie_secret_key": {
+                "type": "string",
+                "minlength": 32,
+                "maxlength": 64,  # we cannot verify maxlength, because base64 representation might be longer than bytes
+            },
+            "max_age": {
+                "type": "integer",
+                "coerce": "integer",
+                "min": 0,
+            },
+            "oauth_provider": {
+                "type": "string",
+            },
+            "oauth_scopes": {
+                "type": "string",
+            },
+            "salt": {
+                "type": "string",
+            },
+        },
+    },
+    "build": {
+        "type": "dict",
+        "schema": {
+            "archbuild_flags": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+            },
+            "build_command": {
+                "type": "string",
+                "required": True,
+            },
+            "ignore_packages": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+            },
+            "makepkg_flags": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+            },
+            "makechrootpkg_flags": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+            },
+            "triggers": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+            },
+            "vcs_allowed_age": {
+                "type": "integer",
+                "coerce": "integer",
+                "min": 0,
+            },
+        },
+    },
+    "repository": {
+        "type": "dict",
+        "schema": {
+            "name": {
+                "type": "string",
+                "required": True,
+            },
+            "root": {
+                "type": "string",
+                "required": True,
+            },
+        },
+    },
+    "sign": {
+        "type": "dict",
+        "allow_unknown": True,
+        "keysrules": {
+            "type": "string",
+            "anyof_regex": ["^target$", "^key$", "^key_.*"],
+        },
+        "schema": {
+            "target": {
+                "type": "list",
+                "coerce": "list",
+                "oneof": [
+                    {"allowed": []},
+                    {"allowed": ["package", "repository"], "dependencies": ["key"]},
+                ],
+            },
+            "key": {
+                "type": "string",
+            },
+        },
+    },
+    "web": {
+        "type": "dict",
+        "schema": {
+            "address": {
+                "type": "string",
+                "is_url": ["http", "https"],
+            },
+            "debug": {
+                "type": "boolean",
+                "coerce": "boolean",
+            },
+            "debug_check_host": {
+                "type": "boolean",
+                "coerce": "boolean",
+            },
+            "debug_allowed_hosts": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {"type": "string"},
+            },
+            "host": {
+                "type": "string",
+                "is_ip_address": ["localhost"],
+            },
+            "index_url": {
+                "type": "string",
+                "is_url": ["http", "https"],
+            },
+            "password": {
+                "type": "string",
+            },
+            "port": {
+                "type": "integer",
+                "coerce": "integer",
+                "min": 0,
+                "max": 65535,
+            },
+            "static_path": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+                "path_exists": True,
+            },
+            "templates": {
+                "type": "path",
+                "coerce": "absolute_path",
+                "required": True,
+                "path_exists": True,
+            },
+            "unix_socket": {
+                "type": "path",
+                "coerce": "absolute_path",
+            },
+            "unix_socket_unsafe": {
+                "type": "boolean",
+                "coerce": "boolean",
+            },
+            "username": {
+                "type": "string",
+            },
+        },
+    },
+}

src/ahriman/core/configuration/validator.py

@@ -0,0 +1,161 @@
+#
+# 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 ipaddress
+
+from cerberus import TypeDefinition, Validator as RootValidator  # type: ignore
+from pathlib import Path
+from typing import Any, List
+from urllib.parse import urlparse
+
+from ahriman.core.configuration import Configuration
+
+
+class Validator(RootValidator):  # type: ignore
+    """
+    class which defines custom validation methods for the service configuration
+
+    Attributes:
+        configuration(Configuration): configuration instance
+    """
+
+    types_mapping = RootValidator.types_mapping.copy()
+    types_mapping["path"] = TypeDefinition("path", (Path,), ())
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        """
+        default constructor
+
+        Args:
+            configuration(Configuration): configuration instance used for extraction
+            *args(Any): positional arguments to be passed to base validator
+            **kwargs(): keyword arguments to be passed to base validator
+        """
+        RootValidator.__init__(self, *args, **kwargs)
+        self.configuration: Configuration = kwargs["configuration"]
+
+    def _normalize_coerce_absolute_path(self, value: str) -> Path:
+        """
+        extract path from string value
+
+        Args:
+            value(str): converting value
+
+        Returns:
+            Path: value converted to path instance according to configuration rules
+        """
+        converted: Path = self.configuration.converters["path"](value)
+        return converted
+
+    def _normalize_coerce_boolean(self, value: str) -> bool:
+        """
+        extract boolean from string value
+
+        Args:
+            value(str): converting value
+
+        Returns:
+            bool: value converted to boolean according to configuration rules
+        """
+        # pylint: disable=protected-access
+        converted: bool = self.configuration._convert_to_boolean(value)  # type: ignore
+        return converted
+
+    def _normalize_coerce_integer(self, value: str) -> int:
+        """
+        extract integer from string value
+
+        Args:
+            value(str): converting value
+
+        Returns:
+            int: value converted to int according to configuration rules
+        """
+        del self
+        return int(value)
+
+    def _normalize_coerce_list(self, value: str) -> List[str]:
+        """
+        extract string list from string value
+
+        Args:
+            value(str): converting value
+
+        Returns:
+            List[str]: value converted to string list instance according to configuration rules
+        """
+        converted: List[str] = self.configuration.converters["list"](value)
+        return converted
+
+    def _validate_is_ip_address(self, constraint: List[str], field: str, value: str) -> None:
+        """
+        check if the specified value is valid ip address
+
+        Args:
+            constraint(List[str]): optional list of allowed special words (e.g. ``localhost``)
+            field(str): field name to be checked
+            value(Path): value to be checked
+
+        Examples:
+            The rule's arguments are validated against this schema:
+            {"type": "list", "schema": {"type": "string"}}
+        """
+        if value in constraint:
+            return
+        try:
+            ipaddress.ip_address(value)
+        except ValueError:
+            self._error(field, f"Value {value} must be valid IP address")
+
+    def _validate_is_url(self, constraint: List[str], field: str, value: str) -> None:
+        """
+        check if the specified value is a valid url
+
+        Args:
+            constraint(List[str]): optional list of supported schemas. If empty, no schema validation will be performed
+            field(str): field name to be checked
+            value(str): value to be checked
+
+        Examples:
+            The rule's arguments are validated against this schema:
+            {"type": "list", "schema": {"type": "string"}}
+        """
+        url = urlparse(value)  # it probably will never rise exceptions on parse
+        if not url.scheme:
+            self._error(field, f"Url scheme is not set for {value}")
+        if not url.netloc and url.scheme not in ("file",):
+            self._error(field, f"Location must be set for url {value} of scheme {url.scheme}")
+        if constraint and url.scheme not in constraint:
+            self._error(field, f"Url {value} scheme must be one of {constraint}")
+
+    def _validate_path_exists(self, constraint: bool, field: str, value: Path) -> None:
+        """
+        check if paths exists
+
+        Args:
+            constraint(bool): True in case if path must exist and False otherwise
+            field(str): field name to be checked
+            value(Path): value to be checked
+
+        Examples:
+            The rule's arguments are validated against this schema:
+            {"type": "boolean"}
+        """
+        if constraint and not value.exists():
+            self._error(field, f"Path {value} must exist")

src/ahriman/core/database/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

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

@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2021-2022 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-from sqlite3 import Connection
-
-from ahriman.core.configuration import Configuration
-from ahriman.core.database.data.package_remotes import migrate_package_remotes
-from ahriman.core.database.data.package_statuses import migrate_package_statuses
-from ahriman.core.database.data.patches import migrate_patches
-from ahriman.core.database.data.users import migrate_users_data
-from ahriman.models.migration_result import MigrationResult
-
-
-def migrate_data(result: MigrationResult, connection: Connection, configuration: Configuration) -> None:
-    """
-    perform data migration
-
-    Args:
-        result(MigrationResult): result of the schema migration
-        connection(Connection): database connection
-        configuration(Configuration): configuration instance
-    """
-    # initial data migration
-    repository_paths = configuration.repository_paths
-
-    if result.old_version <= 0:
-        migrate_package_statuses(connection, repository_paths)
-        migrate_patches(connection, repository_paths)
-        migrate_users_data(connection, configuration)
-    if result.old_version <= 1:
-        migrate_package_remotes(connection, repository_paths)

src/ahriman/core/database/data/package_remotes.py

@@ -1,64 +0,0 @@
-#
-# Copyright (c) 2021-2022 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-from sqlite3 import Connection
-
-from ahriman.models.package_source import PackageSource
-from ahriman.models.remote_source import RemoteSource
-from ahriman.models.repository_paths import RepositoryPaths
-
-
-__all__ = ["migrate_package_remotes"]
-
-
-# pylint: disable=protected-access
-def migrate_package_remotes(connection: Connection, paths: RepositoryPaths) -> None:
-    """
-    perform migration for package remote sources
-
-    Args:
-        connection(Connection): database connection
-        paths(RepositoryPaths): repository paths instance
-    """
-    from ahriman.core.database.operations import PackageOperations
-
-    def insert_remote(base: str, remote: RemoteSource) -> None:
-        connection.execute(
-            """
-            update package_bases set
-            branch = :branch, git_url = :git_url, path = :path,
-            web_url = :web_url, source = :source
-            where package_base = :package_base
-            """,
-            dict(
-                package_base=base,
-                branch=remote.branch, git_url=remote.git_url, path=remote.path,
-                web_url=remote.web_url, source=remote.source
-            )
-        )
-
-    packages = PackageOperations._packages_get_select_package_bases(connection)
-    for package_base, package in packages.items():
-        local_cache = paths.cache_for(package_base)
-        if local_cache.exists() and not package.is_vcs:
-            continue  # skip packages which are not VCS and with local cache
-        remote_source = RemoteSource.from_source(PackageSource.AUR, package_base, "aur")
-        if remote_source is None:
-            continue  # should never happen
-        insert_remote(package_base, remote_source)

src/ahriman/core/database/data/package_statuses.py

@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2021-2022 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 json
-
-from sqlite3 import Connection
-
-from ahriman.models.build_status import BuildStatus
-from ahriman.models.package import Package
-from ahriman.models.repository_paths import RepositoryPaths
-
-
-__all__ = ["migrate_package_statuses"]
-
-
-def migrate_package_statuses(connection: Connection, paths: RepositoryPaths) -> None:
-    """
-    perform migration for package statuses
-
-    Args:
-        connection(Connection): database connection
-        paths(RepositoryPaths): repository paths instance
-    """
-    def insert_base(metadata: Package, last_status: BuildStatus) -> None:
-        connection.execute(
-            """
-            insert into package_bases
-            (package_base, version, aur_url)
-            values
-            (:package_base, :version, :aur_url)
-            """,
-            dict(package_base=metadata.base, version=metadata.version, aur_url=""))
-        connection.execute(
-            """
-            insert into package_statuses
-            (package_base, status, last_updated)
-            values
-            (:package_base, :status, :last_updated)""",
-            dict(package_base=metadata.base, status=last_status.status.value, last_updated=last_status.timestamp))
-
-    def insert_packages(metadata: Package) -> None:
-        package_list = []
-        for name, description in metadata.packages.items():
-            package_list.append(dict(package=name, package_base=metadata.base, **description.view()))
-        connection.executemany(
-            """
-            insert into packages
-            (package, package_base, architecture, archive_size, build_date, depends, description,
-            filename, "groups", installed_size, licenses, provides, url)
-            values
-            (:package, :package_base, :architecture, :archive_size, :build_date, :depends, :description,
-            :filename, :groups, :installed_size, :licenses, :provides, :url)
-            """,
-            package_list)
-
-    cache_path = paths.root / "status_cache.json"
-    if not cache_path.is_file():
-        return  # no file found
-    with cache_path.open() as cache:
-        dump = json.load(cache)
-
-    for item in dump.get("packages", []):
-        package = Package.from_json(item["package"])
-        status = BuildStatus.from_json(item["status"])
-        insert_base(package, status)
-        insert_packages(package)

src/ahriman/core/database/data/patches.py

@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2021-2022 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-from sqlite3 import Connection
-
-from ahriman.models.repository_paths import RepositoryPaths
-
-
-__all__ = ["migrate_patches"]
-
-
-def migrate_patches(connection: Connection, paths: RepositoryPaths) -> None:
-    """
-    perform migration for patches
-
-    Args:
-        connection(Connection): database connection
-        paths(RepositoryPaths): repository paths instance
-    """
-    root = paths.root / "patches"
-    if not root.is_dir():
-        return  # no directory found
-
-    for package in root.iterdir():
-        patch_path = package / "00-main.patch"
-        if not patch_path.is_file():
-            continue  # not exist
-        content = patch_path.read_text(encoding="utf8")
-        connection.execute(
-            """insert into patches (package_base, patch) values (:package_base, :patch)""",
-            {"package_base": package.name, "patch": content})

src/ahriman/core/database/data/users.py

@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2021-2022 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-from sqlite3 import Connection
-
-from ahriman.core.configuration import Configuration
-
-
-__all__ = ["migrate_users_data"]
-
-
-def migrate_users_data(connection: Connection, configuration: Configuration) -> None:
-    """
-    perform migration for users
-
-    Args:
-        connection(Connection): database connection
-        configuration(Configuration): configuration instance
-    """
-    for section in configuration.sections():
-        for option, value in configuration[section].items():
-            if not section.startswith("auth:"):
-                continue
-            access = section[5:]
-            connection.execute(
-                """insert into users (username, access, password) values (:username, :access, :password)""",
-                {"username": option.lower(), "access": access, "password": value})

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,16 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import annotations
-
 from importlib import import_module
 from pathlib import Path
 from pkgutil import iter_modules
-from sqlite3 import Connection
-from typing import List, Type
+from sqlite3 import Connection, Cursor
+from typing import Callable, List
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.data import migrate_data
 from ahriman.core.log import LazyLogging
 from ahriman.models.migration import Migration
 from ahriman.models.migration_result import MigrationResult
@@ -53,8 +50,8 @@ class Migrations(LazyLogging):
         self.connection = connection
         self.configuration = configuration
 
-    @classmethod
-    def migrate(cls: Type[Migrations], connection: Connection, configuration: Configuration) -> MigrationResult:
+    @staticmethod
+    def migrate(connection: Connection, configuration: Configuration) -> MigrationResult:
         """
         perform migrations implicitly
 
@@ -65,7 +62,26 @@ class Migrations(LazyLogging):
         Returns:
             MigrationResult: current schema version
         """
-        return cls(connection, configuration).run()
+        return Migrations(connection, configuration).run()
+
+    def migration(self, cursor: Cursor, migration: Migration) -> None:
+        """
+        perform single migration
+
+        Args:
+            cursor(Cursor): connection cursor
+            migration(Migration): single migration to perform
+        """
+        self.logger.info("applying table migration %s at index %s", migration.name, migration.index)
+        for statement in migration.steps:
+            cursor.execute(statement)
+        self.logger.info("table migration %s at index %s has been applied", migration.name, migration.index)
+
+        self.logger.info("perform data migration %s at index %s", migration.name, migration.index)
+        migration.migrate_data(self.connection, self.configuration)
+        self.logger.info(
+            "data migration %s at index %s has been performed",
+            migration.name, migration.index)
 
     def migrations(self) -> List[Migration]:
         """
@@ -81,9 +97,21 @@ class Migrations(LazyLogging):
 
         for index, module_name in enumerate(sorted(modules)):
             module = import_module(f"{__name__}.{module_name}")
+
             steps: List[str] = getattr(module, "steps", [])
             self.logger.debug("found migration %s at index %s with steps count %s", module_name, index, len(steps))
-            migrations.append(Migration(index=index, name=module_name, steps=steps))
+
+            migrate_data: Callable[[Connection, Configuration], None] = \
+                getattr(module, "migrate_data", lambda *args: None)
+
+            migrations.append(
+                Migration(
+                    index=index,
+                    name=module_name,
+                    steps=steps,
+                    migrate_data=migrate_data
+                )
+            )
 
         return migrations
 
@@ -110,13 +138,7 @@ class Migrations(LazyLogging):
             try:
                 cursor.execute("begin exclusive")
                 for migration in migrations[current_version:]:
-                    self.logger.info("applying migration %s at index %s", migration.name, migration.index)
-                    for statement in migration.steps:
-                        cursor.execute(statement)
-                    self.logger.info("migration %s at index %s has been applied", migration.name, migration.index)
-
-                migrate_data(result, self.connection, self.configuration)
-
+                    self.migration(cursor, migration)
                 cursor.execute(f"pragma user_version = {expected_version}")  # no support for ? placeholders
             except Exception:
                 self.logger.exception("migration failed with exception")

src/ahriman/core/database/migrations/m000_initial.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,7 +17,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__all__ = ["steps"]
+import json
+
+from sqlite3 import Connection
+
+from ahriman.core.configuration import Configuration
+from ahriman.models.build_status import BuildStatus
+from ahriman.models.package import Package
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+__all__ = ["migrate_data", "steps"]
 
 
 steps = [
@@ -73,3 +83,109 @@ steps = [
     )
     """,
 ]
+
+
+def migrate_data(connection: Connection, configuration: Configuration) -> None:
+    """
+    perform data migration
+
+    Args:
+        connection(Connection): database connection
+        configuration(Configuration): configuration instance
+    """
+    migrate_package_statuses(connection, configuration.repository_paths)
+    migrate_patches(connection, configuration.repository_paths)
+    migrate_users_data(connection, configuration)
+
+
+def migrate_package_statuses(connection: Connection, paths: RepositoryPaths) -> None:
+    """
+    perform migration for package statuses
+
+    Args:
+        connection(Connection): database connection
+        paths(RepositoryPaths): repository paths instance
+    """
+    def insert_base(metadata: Package, last_status: BuildStatus) -> None:
+        connection.execute(
+            """
+            insert into package_bases
+            (package_base, version, aur_url)
+            values
+            (:package_base, :version, :aur_url)
+            """,
+            {"package_base": metadata.base, "version": metadata.version, "aur_url": ""})
+        connection.execute(
+            """
+            insert into package_statuses
+            (package_base, status, last_updated)
+            values
+            (:package_base, :status, :last_updated)""",
+            {"package_base": metadata.base, "status": last_status.status.value, "last_updated": last_status.timestamp})
+
+    def insert_packages(metadata: Package) -> None:
+        package_list = []
+        for name, description in metadata.packages.items():
+            package_list.append({"package": name, "package_base": metadata.base, **description.view()})
+        connection.executemany(
+            """
+            insert into packages
+            (package, package_base, architecture, archive_size, build_date, depends, description,
+            filename, "groups", installed_size, licenses, provides, url)
+            values
+            (:package, :package_base, :architecture, :archive_size, :build_date, :depends, :description,
+            :filename, :groups, :installed_size, :licenses, :provides, :url)
+            """,
+            package_list)
+
+    cache_path = paths.root / "status_cache.json"
+    if not cache_path.is_file():
+        return  # no file found
+    with cache_path.open() as cache:
+        dump = json.load(cache)
+
+    for item in dump.get("packages", []):
+        package = Package.from_json(item["package"])
+        status = BuildStatus.from_json(item["status"])
+        insert_base(package, status)
+        insert_packages(package)
+
+
+def migrate_patches(connection: Connection, paths: RepositoryPaths) -> None:
+    """
+    perform migration for patches
+
+    Args:
+        connection(Connection): database connection
+        paths(RepositoryPaths): repository paths instance
+    """
+    root = paths.root / "patches"
+    if not root.is_dir():
+        return  # no directory found
+
+    for package in root.iterdir():
+        patch_path = package / "00-main.patch"
+        if not patch_path.is_file():
+            continue  # not exist
+        content = patch_path.read_text(encoding="utf8")
+        connection.execute(
+            """insert into patches (package_base, patch) values (:package_base, :patch)""",
+            {"package_base": package.name, "patch": content})
+
+
+def migrate_users_data(connection: Connection, configuration: Configuration) -> None:
+    """
+    perform migration for users
+
+    Args:
+        connection(Connection): database connection
+        configuration(Configuration): configuration instance
+    """
+    for section in configuration.sections():
+        for option, value in configuration[section].items():
+            if not section.startswith("auth:"):
+                continue
+            access = section[5:]
+            connection.execute(
+                """insert into users (username, access, password) values (:username, :access, :password)""",
+                {"username": option.lower(), "access": access, "password": value})

src/ahriman/core/database/migrations/m001_package_source.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,7 +17,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__all__ = ["steps"]
+from sqlite3 import Connection
+
+from ahriman.core.configuration import Configuration
+from ahriman.models.package_source import PackageSource
+from ahriman.models.remote_source import RemoteSource
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+__all__ = ["migrate_data", "steps"]
 
 
 steps = [
@@ -40,3 +48,51 @@ steps = [
     alter table package_bases drop column aur_url
     """,
 ]
+
+
+def migrate_data(connection: Connection, configuration: Configuration) -> None:
+    """
+    perform data migration
+
+    Args:
+        connection(Connection): database connection
+        configuration(Configuration): configuration instance
+    """
+    migrate_package_remotes(connection, configuration.repository_paths)
+
+
+# pylint: disable=protected-access
+def migrate_package_remotes(connection: Connection, paths: RepositoryPaths) -> None:
+    """
+    perform migration for package remote sources
+
+    Args:
+        connection(Connection): database connection
+        paths(RepositoryPaths): repository paths instance
+    """
+    from ahriman.core.database.operations import PackageOperations
+
+    def insert_remote(base: str, remote: RemoteSource) -> None:
+        connection.execute(
+            """
+            update package_bases set
+            branch = :branch, git_url = :git_url, path = :path,
+            web_url = :web_url, source = :source
+            where package_base = :package_base
+            """,
+            {
+                "package_base": base,
+                "branch": remote.branch, "git_url": remote.git_url, "path": remote.path,
+                "web_url": remote.web_url, "source": remote.source
+            }
+        )
+
+    packages = PackageOperations._packages_get_select_package_bases(connection)
+    for package_base, package in packages.items():
+        local_cache = paths.cache_for(package_base)
+        if local_cache.exists() and not package.is_vcs:
+            continue  # skip packages which are not VCS and with local cache
+        remote_source = RemoteSource.from_source(PackageSource.AUR, package_base, "aur")
+        if remote_source is None:
+            continue  # should never happen
+        insert_remote(package_base, remote_source)

src/ahriman/core/database/migrations/m002_user_access.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m003_patch_variables.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m004_logs.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/core/database/migrations/m005_make_opt_depends.py

@@ -0,0 +1,83 @@
+#
+# Copyright (c) 2021-2023 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from sqlite3 import Connection
+
+from ahriman.core.alpm.pacman import Pacman
+from ahriman.core.configuration import Configuration
+from ahriman.core.util import package_like
+from ahriman.models.package import Package
+
+
+__all__ = ["migrate_data", "steps"]
+
+
+steps = [
+    """
+    alter table packages add column make_depends json
+    """,
+    """
+    alter table packages add column opt_depends json
+    """,
+]
+
+
+def migrate_data(connection: Connection, configuration: Configuration) -> None:
+    """
+    perform data migration
+
+    Args:
+        connection(Connection): database connection
+        configuration(Configuration): configuration instance
+    """
+    migrate_package_depends(connection, configuration)
+
+
+def migrate_package_depends(connection: Connection, configuration: Configuration) -> None:
+    """
+    migrate package opt and make depends fields
+
+    Args:
+        connection(Connection): database connection
+        configuration(Configuration): configuration instance
+    """
+    if not configuration.repository_paths.repository.is_dir():
+        return
+
+    _, architecture = configuration.check_loaded()
+    pacman = Pacman(architecture, configuration, refresh_database=False)
+
+    package_list = []
+    for full_path in filter(package_like, configuration.repository_paths.repository.iterdir()):
+        base = Package.from_archive(full_path, pacman, remote=None)
+        for package, description in base.packages.items():
+            package_list.append({
+                "make_depends": description.make_depends,
+                "opt_depends": description.opt_depends,
+                "package": package,
+            })
+
+    connection.executemany(
+        """
+        update packages set
+        make_depends = :make_depends, opt_depends = :opt_depends
+        where package = :package
+        """,
+        package_list
+    )

src/ahriman/core/database/migrations/m006_packages_architecture_required.py

@@ -0,0 +1,53 @@
+#
+# 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/>.
+#
+__all__ = ["steps"]
+
+
+steps = [
+    """
+    alter table packages rename to packages_
+    """,
+    """
+    create table packages (
+        package text not null,
+        package_base text not null,
+        architecture text not null,
+        archive_size integer,
+        build_date integer,
+        depends json,
+        description text,
+        filename text,
+        "groups" json,
+        installed_size integer,
+        licenses json,
+        provides json,
+        url text,
+        make_depends json,
+        opt_depends json,
+        unique (package, architecture)
+    )
+    """,
+    """
+    insert into packages select * from packages_ where architecture is not null;
+    """,
+    """
+    drop table packages_;
+    """,
+]