From 6d488c1513675c5fc009986cba1336c42b4f58bf Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 1 Feb 2017 08:25:11 +0000
Subject: update things

---
 config-base-collectd.PKGBUILD            | 23 +++++++++++++++++++
 config-base-pacman.PKGBUILD              | 23 +++++++++++++++++++
 config-mgmt-collectd.PKGBUILD            | 23 -------------------
 config-mgmt-config.PKGBUILD              | 17 ++++++++++++++
 config-mgmt-pacman-repo-config.PKGBUILD  | 17 ++++++++++++++
 config-mgmt-pacman-repo-lukeshu.PKGBUILD | 16 +++++++++++++
 config-mgmt-pacman.PKGBUILD              | 21 +++++++----------
 config-service-myhostname.PKGBUILD       | 39 +++++++++++++++++++++++++-------
 8 files changed, 135 insertions(+), 44 deletions(-)
 create mode 100644 config-base-collectd.PKGBUILD
 create mode 100644 config-base-pacman.PKGBUILD
 delete mode 100644 config-mgmt-collectd.PKGBUILD
 create mode 100644 config-mgmt-config.PKGBUILD
 create mode 100644 config-mgmt-pacman-repo-config.PKGBUILD
 create mode 100644 config-mgmt-pacman-repo-lukeshu.PKGBUILD

diff --git a/config-base-collectd.PKGBUILD b/config-base-collectd.PKGBUILD
new file mode 100644
index 0000000..ca7e4e9
--- /dev/null
+++ b/config-base-collectd.PKGBUILD
@@ -0,0 +1,23 @@
+. ${BUILDFILE%/*}/common.sh
+pkgver=20170131
+
+depends=(collectd)
+
+package() {
+preamble
+# #### collectd
+
+# In order for configuration sets to modularly adjust the collectd
+# configuration, we patch `/etc/collectd.conf` to include
+# `/etc/collectd.d/*.conf`.
+add-file -m755 usr/share/holo/files/10-"$pkgname"/etc/collectd.conf.holoscript <<EOF
+#!/bin/sh
+{
+	grep -vxF 'Include "/etc/collectd.d/*.conf"'
+	echo
+	echo 'Include "/etc/collectd.d/*.conf"'
+} | cat -s
+EOF
+
+postamble
+}
diff --git a/config-base-pacman.PKGBUILD b/config-base-pacman.PKGBUILD
new file mode 100644
index 0000000..a815d45
--- /dev/null
+++ b/config-base-pacman.PKGBUILD
@@ -0,0 +1,23 @@
+. ${BUILDFILE%/*}/common.sh
+pkgver=20170131
+
+depends=(pacman)
+
+package() {
+preamble
+# #### pacman
+
+# In order for configuration sets to modularly adjust the pacman
+# configuration, we patch `/etc/pacman.conf` to include
+# `/etc/pacman.d/*.conf`.
+add-file -m755 usr/share/holo/files/10-"$pkgname"/etc/pacman.conf.holoscript <<EOF
+#!/bin/sh
+{
+	grep -vxF 'Include = /etc/pacman.d/*.conf'
+	echo
+	echo 'Include = /etc/pacman.d/*.conf'
+} | cat -s
+EOF
+
+postamble
+}
diff --git a/config-mgmt-collectd.PKGBUILD b/config-mgmt-collectd.PKGBUILD
deleted file mode 100644
index ca7e4e9..0000000
--- a/config-mgmt-collectd.PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-. ${BUILDFILE%/*}/common.sh
-pkgver=20170131
-
-depends=(collectd)
-
-package() {
-preamble
-# #### collectd
-
-# In order for configuration sets to modularly adjust the collectd
-# configuration, we patch `/etc/collectd.conf` to include
-# `/etc/collectd.d/*.conf`.
-add-file -m755 usr/share/holo/files/10-"$pkgname"/etc/collectd.conf.holoscript <<EOF
-#!/bin/sh
-{
-	grep -vxF 'Include "/etc/collectd.d/*.conf"'
-	echo
-	echo 'Include "/etc/collectd.d/*.conf"'
-} | cat -s
-EOF
-
-postamble
-}
diff --git a/config-mgmt-config.PKGBUILD b/config-mgmt-config.PKGBUILD
new file mode 100644
index 0000000..2828fcb
--- /dev/null
+++ b/config-mgmt-config.PKGBUILD
@@ -0,0 +1,17 @@
+. ${BUILDFILE%/*}/common.sh
+pkgver=20170131
+
+package() {
+preamble
+
+depends+=(
+    config-mgmt-pacman-repo-config
+    config-mgmt-etckeeper
+
+    # Until there is a suitable Holo in PCR
+    config-mgmt-pacman-repo-lukeshu
+    holo-lukeshu
+)
+
+postamble
+}
diff --git a/config-mgmt-pacman-repo-config.PKGBUILD b/config-mgmt-pacman-repo-config.PKGBUILD
new file mode 100644
index 0000000..7af21aa
--- /dev/null
+++ b/config-mgmt-pacman-repo-config.PKGBUILD
@@ -0,0 +1,17 @@
+. ${BUILDFILE%/*}/common.sh
+pkgver=20170131
+
+package() {
+preamble
+# #### pacman
+
+depends+=(config-base-pacman)
+
+add-file etc/pacman.d/repo-config.conf <<EOF
+[config]
+SigLevel = Optional TrustAll
+Server = https://config.parabola.nu/
+EOF
+
+postamble
+}
diff --git a/config-mgmt-pacman-repo-lukeshu.PKGBUILD b/config-mgmt-pacman-repo-lukeshu.PKGBUILD
new file mode 100644
index 0000000..2d74b61
--- /dev/null
+++ b/config-mgmt-pacman-repo-lukeshu.PKGBUILD
@@ -0,0 +1,16 @@
+. ${BUILDFILE%/*}/common.sh
+pkgver=20170131
+
+package() {
+preamble
+# #### pacman
+
+depends+=(config-base-pacman)
+
+add-file etc/pacman.d/repo-lukeshu.conf <<EOF
+[~lukeshu]
+Include = /etc/pacman.d/mirrorlist
+EOF
+
+postamble
+}
diff --git a/config-mgmt-pacman.PKGBUILD b/config-mgmt-pacman.PKGBUILD
index a815d45..7fa5d31 100644
--- a/config-mgmt-pacman.PKGBUILD
+++ b/config-mgmt-pacman.PKGBUILD
@@ -1,22 +1,17 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20170131
-
-depends=(pacman)
+pkgver=20170131.1
 
 package() {
 preamble
 # #### pacman
 
-# In order for configuration sets to modularly adjust the pacman
-# configuration, we patch `/etc/pacman.conf` to include
-# `/etc/pacman.d/*.conf`.
-add-file -m755 usr/share/holo/files/10-"$pkgname"/etc/pacman.conf.holoscript <<EOF
-#!/bin/sh
-{
-	grep -vxF 'Include = /etc/pacman.d/*.conf'
-	echo
-	echo 'Include = /etc/pacman.d/*.conf'
-} | cat -s
+depends+=(config-base-pacman)
+
+add-file etc/pacman.d/options.conf <<EOF
+[options]
+Color
+TotalDownload
+VerbosePkgLists
 EOF
 
 postamble
diff --git a/config-service-myhostname.PKGBUILD b/config-service-myhostname.PKGBUILD
index 5285c8b..ff32aaa 100644
--- a/config-service-myhostname.PKGBUILD
+++ b/config-service-myhostname.PKGBUILD
@@ -1,15 +1,11 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20161112
+pkgver=20170201.1
 
 package() {
 preamble
 # #### Host information
 
-depends+=(
-	config-mgmt-nginx
-	config-mgmt-uwsgi
-	uwsgi-plugin-cgi
-)
+depends+=(config-mgmt-nginx)
 
 add-file etc/nginx/sites/server-myhostname.conf <<EOF
 # -*- Mode: nginx; nginx-indent-level: 8; indent-tabs-mode: t -*-
@@ -33,6 +29,13 @@ server {
 }
 EOF
 
+# Let's have a simple CGI script show server info
+
+depends+=(
+	config-mgmt-uwsgi
+	uwsgi-plugin-cgi
+)
+
 add-file -m755 srv/http/myhostname/sysinfo <<EOF
 #!/bin/bash
 # Copyright 2016 Luke Shumaker
@@ -56,8 +59,6 @@ for cmd in "\${cmds[@]}"; do
 done
 EOF
 
-ln -s /var/cache/pacman/pkg srv/http/myhostname/pkg
-
 add-file etc/uwsgi/myhostname.ini <<EOF
 [uwsgi]
 master = true
@@ -72,5 +73,27 @@ EOF
 
 add-unit etc/systemd/system/sockets.target.wants/uwsgi@myhostname.socket
 
+# Expose the pacman cache so pinned packages can be duplicated
+ln -s /var/cache/pacman/pkg srv/http/myhostname/pkg
+
+# Expose collectd via RRD files
+ln -s /var/lib/collectd srv/http/myhostname/collectd
+
+depends+=(
+	config-base-collectd
+	rrdtool
+	config-mgmt-pacman-repo-lukeshu # for systemd-timesyncd-wait-git
+	systemd-timesyncd-wait-git
+)
+
+add-unit etc/systemd/system/multi-user.target.wants/collectd.service
+
+add-file -m644 etc/systemd/system/collectd.service.d/time-sync.conf <<EOF
+[Unit]
+# Because we write RRD files with timestamps in them, we need to have
+# a functional clock.  Otherwise the RRD files will get garbled.
+After=time-sync.target
+EOF
+
 postamble
 }
-- 
cgit v1.2.3