diff options
Diffstat (limited to 'modules/base')
| -rw-r--r-- | modules/base/manifests/bootstrap.pp | 4 | ||||
| -rw-r--r-- | modules/base/manifests/init.pp | 6 | ||||
| -rw-r--r-- | modules/base/templates/update (renamed from modules/base/files/update) | 1 |
3 files changed, 8 insertions, 3 deletions
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/files/update b/modules/base/templates/update index 3ce35b1..fb89a93 100644 --- a/modules/base/files/update +++ b/modules/base/templates/update @@ -8,3 +8,4 @@ puppet-tozt sudo sh -c "cd ~/conf && git pull && make install" yaourt -Syua +<%= @extra_script %> |