tidy

8 files changed, 51 insertions, 9 deletions

diff --git a/config-box-proton-base.PKGBUILD b/config-box-proton-base.PKGBUILD
index 713df7b..2e138bc 100644
--- a/config-box-proton-base.PKGBUILD
+++ b/config-box-proton-base.PKGBUILD
@@ -6,7 +6,7 @@ preamble
 
 # ## Base setup
 
-depends+=(linux-libre-lts grub haveged)
+depends+=(linux-libre-lts grub haveged systemd-swap)
 conflicts+=(linux-libre)
 
 add-file etc/hostname <<EOF
@@ -23,7 +23,9 @@ LC_COLLATE=C
 EOF
 
 add-unit etc/systemd/system/getty.target.wants/getty@tty1.service
+add-unit etc/systemd/system/local-fs.target.wants/systemd-swap.service
 add-unit etc/systemd/system/multi-user.target.wants/haveged.service
+add-unit etc/systemd/system/multi-user.target.wants/remote-fs.target
 
 ln -s ../usr/lib/os-release etc/os-release
 install -d etc/ssl/certs
diff --git a/config-box-winston-base.PKGBUILD b/config-box-winston-base.PKGBUILD
index 0ea9dba..eaac6c6 100644
--- a/config-box-winston-base.PKGBUILD
+++ b/config-box-winston-base.PKGBUILD
@@ -32,7 +32,6 @@ add-unit etc/systemd/system/local-fs.target.wants/systemd-swap.service
 add-unit etc/systemd/system/multi-user.target.wants/haveged.service
 add-unit etc/systemd/system/multi-user.target.wants/irqbalance.service
 add-unit etc/systemd/system/multi-user.target.wants/remote-fs.target
-add-unit etc/systemd/system/multi-user.target.wants/sshd.service
 
 ln -s ../usr/lib/os-release etc/os-release
 install -d etc/ssl/certs
diff --git a/config-service-config.PKGBUILD b/config-service-config.PKGBUILD
index d9d91f9..99a984a 100644
--- a/config-service-config.PKGBUILD
+++ b/config-service-config.PKGBUILD
@@ -4,7 +4,10 @@ pkgver=20161111.3
 package() {
 preamble
 
-depends+=(nginx config-mgmt-certbot)
+depends+=(
+	config-mgmt-nginx
+	config-mgmt-certbot
+)
 
 add-file -m755 etc/ssl/misc/certbot-get.d/10-config <<EOF
 #!/bin/bash
diff --git a/config-service-git.PKGBUILD b/config-service-git.PKGBUILD
index 222357b..7ef90e1 100644
--- a/config-service-git.PKGBUILD
+++ b/config-service-git.PKGBUILD
@@ -4,13 +4,19 @@ pkgver=20161111.1
 package() {
 preamble
 
-depends+=(git)
+depends+=(config-mgmt-certbot)
 
 add-file -m755 etc/ssl/misc/certbot-get.d/10-git <<EOF
 #!/bin/bash
 echo git.{parabola.nu,parabolagnulinux.org}
 EOF
 
+depends+=(
+	git # for the 'git' user
+	cronie
+	moreutils # for chronic
+)
+
 # Metadata about all of the git repositories, as well as most of the
 # setup, lives in the git-meta.git repository. The git user has a
 # cron-job to update this repository every hour.
@@ -28,7 +34,12 @@ add-unit etc/systemd/system/sockets.target.wants/git-daemon.socket
 
 # ## transport: HTTPS
 
-depends+=(cgit uwsgi-plugin-cgi config-mgmt-uwsgi nginx config-mgmt-certbot)
+depends+=(
+	cgit
+	config-mgmt-nginx
+	config-mgmt-uwsgi
+	uwsgi-plugin-cgi
+)
 
 # The git web interface is cgit, which is managed by uWSGI speaking
 # uwsgi/modifier1=9, which is the variant of the uwsgi protocol for
diff --git a/config-service-myhostname.PKGBUILD b/config-service-myhostname.PKGBUILD
index 3fc1630..7815b68 100644
--- a/config-service-myhostname.PKGBUILD
+++ b/config-service-myhostname.PKGBUILD
@@ -4,6 +4,12 @@ pkgver=20161111.4
 package() {
 preamble
 
+depends+=(
+	config-mgmt-nginx
+	config-mgmt-uwsgi
+	uwsgi-plugin-cgi
+)
+
 add-file etc/nginx/sites/server-myhostname.conf <<EOF
 # -*- Mode: nginx; nginx-indent-level: 8; indent-tabs-mode: t -*-
 
diff --git a/config-service-projects.PKGBUILD b/config-service-projects.PKGBUILD
index de58af2..52a3b1e 100644
--- a/config-service-projects.PKGBUILD
+++ b/config-service-projects.PKGBUILD
@@ -4,7 +4,10 @@ pkgver=20161111.1
 package() {
 preamble
 
-depends+=(nginx config-mgmt-certbot)
+depends+=(
+	config-mgmt-nginx
+	config-mgmt-certbot
+)
 
 add-file -m755 etc/ssl/misc/certbot-get.d/10-projects <<EOF
 #!/bin/bash
diff --git a/config-service-repo.PKGBUILD b/config-service-repo.PKGBUILD
index 3e0ee48..c11b0a4 100644
--- a/config-service-repo.PKGBUILD
+++ b/config-service-repo.PKGBUILD
@@ -7,6 +7,13 @@ conflicts=(pacman-mirrorlist)
 package() {
 preamble
 
+depends+=(
+	p:config-mgmt-nginx
+	p:uwsgi-plugin-php
+	p:unionfs-fuse
+	p:oxygen-icons
+)
+
 add-file etc/pacman.d/mirrorlist <<EOF
 Server = file:///srv/repo/main/$repo/os/$arch
 EOF
diff --git a/config-service-wiki.PKGBUILD b/config-service-wiki.PKGBUILD
index 5de4cbe..2b96674 100644
--- a/config-service-wiki.PKGBUILD
+++ b/config-service-wiki.PKGBUILD
@@ -4,9 +4,20 @@ pkgver=20161111.2
 package() {
 preamble
 
-depends+=(uwsgi-plugin-php php-apcu-bc php-intl)
-depends+=(mariadb imagemagick config-mgmt-uwsgi config-mgmt-certbot)
-depends+=(git)
+depends+=(
+	# PHP
+	config-mgmt-certbot
+	config-mgmt-nginx
+	config-mgmt-uwsgi
+	uwsgi-plugin-php
+	php-apcu-bc
+	php-intl
+	# External
+	mariadb
+	imagemagick
+	# Deployment
+	git
+)
 
 add-file -m755 etc/ssl/misc/certbot-get.d/10-wiki <<EOF
 #!/bin/bash