fix

19 files changed, 62 insertions, 58 deletions

diff --git a/config-parabola-base-openresolv.PKGBUILD b/config-parabola-base-openresolv.PKGBUILD
index 289f2a5..9bd86ce 100644
--- a/config-parabola-base-openresolv.PKGBUILD
+++ b/config-parabola-base-openresolv.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
@@ -21,7 +21,7 @@ EOF
 _EOF_
 
 # Instruct pacman to not try to update it.
-depends+=(config-base-pacman)
+depends+=(config-parabola-base-pacman)
 add-file etc/pacman.d/resolvconf.conf <<'EOF'
 [options]
 NoExtract = etc/resolv.conf
diff --git a/config-parabola-box-beefcake-base.PKGBUILD b/config-parabola-box-beefcake-base.PKGBUILD
index 993a52d..b720bc8 100644
--- a/config-parabola-box-beefcake-base.PKGBUILD
+++ b/config-parabola-box-beefcake-base.PKGBUILD
@@ -1,10 +1,10 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
-depends+=(config-box-base)
+depends+=(config-parabola-box-base)
 
 # #### base setup
 
diff --git a/config-parabola-box-beefcake.PKGBUILD b/config-parabola-box-beefcake.PKGBUILD
index c0e64cf..9f667aa 100644
--- a/config-parabola-box-beefcake.PKGBUILD
+++ b/config-parabola-box-beefcake.PKGBUILD
@@ -1,20 +1,20 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
 depends+=(
-	config-box-beefcake-base
+	config-parabola-box-beefcake-base
 
-	config-mgmt-etckeeper
-	config-mgmt-pacman-repo-config
-	config-mgmt-pacman-repo-lukeshu
-	config-mgmt-ssh
-	config-mgmt-swap
-	config-mgmt-users-base
+	config-parabola-mgmt-etckeeper
+	config-parabola-mgmt-pacman-repo-config
+	config-parabola-mgmt-pacman-repo-lukeshu
+	config-parabola-mgmt-ssh
+	config-parabola-mgmt-swap
+	config-parabola-mgmt-users-base
 
-	config-convenience
+	config-parabola-convenience
 )
 
 postamble
diff --git a/config-parabola-box-proton-base.PKGBUILD b/config-parabola-box-proton-base.PKGBUILD
index 952e01b..e7b314e 100644
--- a/config-parabola-box-proton-base.PKGBUILD
+++ b/config-parabola-box-proton-base.PKGBUILD
@@ -1,10 +1,10 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
-depends+=(config-box-base)
+depends+=(config-parabola-box-base)
 
 # #### base setup
 
diff --git a/config-parabola-box-winston-base.PKGBUILD b/config-parabola-box-winston-base.PKGBUILD
index f3c59a7..cf60cba 100644
--- a/config-parabola-box-winston-base.PKGBUILD
+++ b/config-parabola-box-winston-base.PKGBUILD
@@ -1,10 +1,10 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
-depends+=(config-box-base)
+depends+=(config-parabola-box-base)
 
 # #### base setup
 
diff --git a/config-parabola-mgmt-backup.PKGBUILD b/config-parabola-mgmt-backup.PKGBUILD
index 9ce04dd..5372234 100644
--- a/config-parabola-mgmt-backup.PKGBUILD
+++ b/config-parabola-mgmt-backup.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
@@ -121,7 +121,7 @@ add-unit etc/systemd/system/timers.target.wants/backup.timer
 # Expose encrypted backups
 mkdir -p srv/http/myhostname
 ln -s /var/lib/backup/public srv/http/myhostname/backup
-depends+=(config-service-myhostname)
+depends+=(config-parabola-service-myhostname)
 
 postamble
 }
diff --git a/config-parabola-mgmt-config.PKGBUILD b/config-parabola-mgmt-config.PKGBUILD
index 51df921..79dc61b 100644
--- a/config-parabola-mgmt-config.PKGBUILD
+++ b/config-parabola-mgmt-config.PKGBUILD
@@ -1,12 +1,12 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
 depends+=(
-    config-mgmt-pacman-repo-config
-    config-mgmt-etckeeper
+    config-parabola-mgmt-pacman-repo-config
+    config-parabola-mgmt-etckeeper
     'holo>2.2'
 )
 
diff --git a/config-parabola-mgmt-nshd-local.PKGBUILD b/config-parabola-mgmt-nshd-local.PKGBUILD
index c4c2d55..20abee8 100644
--- a/config-parabola-mgmt-nshd-local.PKGBUILD
+++ b/config-parabola-mgmt-nshd-local.PKGBUILD
@@ -1,12 +1,12 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
-depends=(config-mgmt-nshd sudo run-parts)
-provides=(config-mgmt-nshd-updater)
-conflicts=(config-mgmt-nshd-updater)
+depends=(config-parabola-mgmt-nshd sudo run-parts)
+provides=(config-parabola-mgmt-nshd-updater)
+conflicts=(config-parabola-mgmt-nshd-updater)
 
 # Have a git hook take care of it; just give the hook permission to
 # run our hooks.
diff --git a/config-parabola-mgmt-nshd-remote.PKGBUILD b/config-parabola-mgmt-nshd-remote.PKGBUILD
index dac4cb1..f7458d7 100644
--- a/config-parabola-mgmt-nshd-remote.PKGBUILD
+++ b/config-parabola-mgmt-nshd-remote.PKGBUILD
@@ -1,12 +1,12 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 
-depends=(config-mgmt-nshd sudo run-parts)
-provides=(config-mgmt-nshd-updater)
-conflicts=(config-mgmt-nshd-updater)
+depends=(config-parabola-mgmt-nshd sudo run-parts)
+provides=(config-parabola-mgmt-nshd-updater)
+conflicts=(config-parabola-mgmt-nshd-updater)
 
 add-file etc/systemd/system/hackers-update.timer <<EOF
 [Unit]
diff --git a/config-parabola-mgmt-nshd.PKGBUILD b/config-parabola-mgmt-nshd.PKGBUILD
index 3e918d0..d9affc0 100644
--- a/config-parabola-mgmt-nshd.PKGBUILD
+++ b/config-parabola-mgmt-nshd.PKGBUILD
@@ -1,11 +1,15 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### Parabola hackers
 
-depends=(parabola-hackers-nshd openssh config-mgmt-nshd-updater)
+depends=(
+	parabola-hackers-nshd
+	openssh
+	config-parabola-mgmt-nshd-updater
+)
 
 # sshd is configured to force the use of keys (no password-based
 # login), and to use [parabola-hackers][] `ssh-list-authorized-keys`
diff --git a/config-parabola-mgmt-pacman-repo-config.PKGBUILD b/config-parabola-mgmt-pacman-repo-config.PKGBUILD
index 59086e1..3a6395e 100644
--- a/config-parabola-mgmt-pacman-repo-config.PKGBUILD
+++ b/config-parabola-mgmt-pacman-repo-config.PKGBUILD
@@ -1,11 +1,11 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### pacman
 
-depends+=(config-base-pacman)
+depends+=(config-parabola-base-pacman)
 
 add-file etc/pacman.d/repo-config.conf <<EOF
 [config]
diff --git a/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD b/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD
index f1211a1..85246ec 100644
--- a/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD
+++ b/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD
@@ -1,11 +1,11 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### pacman
 
-depends+=(config-base-pacman)
+depends+=(config-parabola-base-pacman)
 
 add-file etc/pacman.d/repo-lukeshu.conf <<EOF
 [~lukeshu]
diff --git a/config-parabola-mgmt-pacman.PKGBUILD b/config-parabola-mgmt-pacman.PKGBUILD
index 8e55903..91200b5 100644
--- a/config-parabola-mgmt-pacman.PKGBUILD
+++ b/config-parabola-mgmt-pacman.PKGBUILD
@@ -1,11 +1,11 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### pacman
 
-depends+=(config-base-pacman)
+depends+=(config-parabola-base-pacman)
 
 add-file etc/pacman.d/options.conf <<EOF
 [options]
diff --git a/config-parabola-service-config.PKGBUILD b/config-parabola-service-config.PKGBUILD
index ed59d8b..7db002b 100644
--- a/config-parabola-service-config.PKGBUILD
+++ b/config-parabola-service-config.PKGBUILD
@@ -1,13 +1,13 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### Config
 
 depends+=(
-	config-mgmt-nginx
-	config-mgmt-certbot
+	config-parabola-mgmt-nginx
+	config-parabola-mgmt-certbot
 	art
 )
 
diff --git a/config-parabola-service-git.PKGBUILD b/config-parabola-service-git.PKGBUILD
index db66474..cef4f3f 100644
--- a/config-parabola-service-git.PKGBUILD
+++ b/config-parabola-service-git.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
@@ -48,9 +48,9 @@ add-unit etc/systemd/system/sockets.target.wants/git-daemon.socket
 
 depends+=(
 	cgit
-	config-mgmt-certbot
-	config-mgmt-nginx
-	config-mgmt-uwsgi
+	config-parabola-mgmt-certbot
+	config-parabola-mgmt-nginx
+	config-parabola-mgmt-uwsgi
 	uwsgi-plugin-cgi
 )
 
diff --git a/config-parabola-service-myhostname.PKGBUILD b/config-parabola-service-myhostname.PKGBUILD
index fe1bbb3..0bf2fc2 100644
--- a/config-parabola-service-myhostname.PKGBUILD
+++ b/config-parabola-service-myhostname.PKGBUILD
@@ -1,11 +1,11 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### Host information
 
-depends+=(config-mgmt-nginx)
+depends+=(config-parabola-mgmt-nginx)
 
 add-file etc/nginx/sites/server-myhostname.conf <<EOF
 # -*- Mode: nginx; nginx-indent-level: 8; indent-tabs-mode: t -*-
@@ -34,7 +34,7 @@ EOF
 # Let's have a simple CGI script show server info
 
 depends+=(
-	config-mgmt-uwsgi
+	config-parabola-mgmt-uwsgi
 	uwsgi-plugin-cgi
 )
 
@@ -82,7 +82,7 @@ ln -s /var/cache/pacman/pkg srv/http/myhostname/pkg
 ln -s /var/lib/collectd srv/http/myhostname/collectd
 
 depends+=(
-	config-base-collectd
+	config-parabola-base-collectd
 	rrdtool
 	'systemd>=239' # for systemd-time-wait-sync.service
 )
diff --git a/config-parabola-service-projects.PKGBUILD b/config-parabola-service-projects.PKGBUILD
index a4362c0..5740109 100644
--- a/config-parabola-service-projects.PKGBUILD
+++ b/config-parabola-service-projects.PKGBUILD
@@ -1,13 +1,13 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
 # #### Projects
 
 depends+=(
-	config-mgmt-nginx
-	config-mgmt-certbot
+	config-parabola-mgmt-nginx
+	config-parabola-mgmt-certbot
 )
 
 add-file -m755 etc/ssl/misc/certbot-get.d/10-projects <<EOF
diff --git a/config-parabola-service-repo.PKGBUILD b/config-parabola-service-repo.PKGBUILD
index bb82d9f..1188606 100644
--- a/config-parabola-service-repo.PKGBUILD
+++ b/config-parabola-service-repo.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
@@ -16,7 +16,7 @@ depends+=(
 	mktorrent
 	dbscripts
 
-	config-mgmt-nginx
+	config-parabola-mgmt-nginx
 	uwsgi-plugin-php
 	unionfs-fuse
 	oxygen-icons
diff --git a/config-parabola-service-wiki.PKGBUILD b/config-parabola-service-wiki.PKGBUILD
index 20d10a8..b6c43d9 100644
--- a/config-parabola-service-wiki.PKGBUILD
+++ b/config-parabola-service-wiki.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20180826
+pkgver=20180826.1
 
 package() {
 preamble
@@ -7,9 +7,9 @@ preamble
 
 depends+=(
 	# PHP
-	config-mgmt-certbot
-	config-mgmt-nginx
-	config-mgmt-uwsgi
+	config-parabola-mgmt-certbot
+	config-parabola-mgmt-nginx
+	config-parabola-mgmt-uwsgi
 	uwsgi-plugin-php
 	php-apcu-bc
 	php-intl