From 0d6d423d51dc24e2e49a00af32b67009a59bff5c Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 19 Mar 2019 05:00:49 -0400
Subject: update on the mail server should also pull docker images

---
 modules/base/files/update           | 10 ----------
 modules/base/manifests/bootstrap.pp |  4 ++--
 modules/base/manifests/init.pp      |  6 +++++-
 modules/base/templates/update       | 11 +++++++++++
 4 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 modules/base/files/update
 create mode 100644 modules/base/templates/update

(limited to 'modules/base')

diff --git a/modules/base/files/update b/modules/base/files/update
deleted file mode 100644
index 3ce35b1..0000000
--- a/modules/base/files/update
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -eu
-set -o pipefail
-
-puppet-tozt
-
-(cd ~/conf && git pull && make install)
-sudo sh -c "cd ~/conf && git pull && make install"
-
-yaourt -Syua
diff --git a/modules/base/manifests/bootstrap.pp b/modules/base/manifests/bootstrap.pp
index d7ce0bc..d946aa1 100644
--- a/modules/base/manifests/bootstrap.pp
+++ b/modules/base/manifests/bootstrap.pp
@@ -1,4 +1,4 @@
-class base::bootstrap {
+class base::bootstrap($extra_script="") {
   package {
     [
       "puppet",
@@ -12,7 +12,7 @@ class base::bootstrap {
       source => 'puppet:///modules/base/puppet-tozt',
       mode => '0755';
     '/usr/local/bin/update':
-      source => 'puppet:///modules/base/update',
+      content => template('base/update'),
       mode => '0755';
   }
 }
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 3bafa7b..9d64856 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,5 +1,9 @@
 class base {
-  contain base::bootstrap
+  class { 'base::bootstrap':
+    extra_script => "
+      (cd /media/persistent && sudo docker-compose pull -q)
+    ",
+  }
   contain base::operatingsystem
   contain base::services
   contain base::tools
diff --git a/modules/base/templates/update b/modules/base/templates/update
new file mode 100644
index 0000000..fb89a93
--- /dev/null
+++ b/modules/base/templates/update
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -eu
+set -o pipefail
+
+puppet-tozt
+
+(cd ~/conf && git pull && make install)
+sudo sh -c "cd ~/conf && git pull && make install"
+
+yaourt -Syua
+<%= @extra_script %>
-- 
cgit v1.2.3-54-g00ecf