Moved git2puppet into a dedicated file.
authorAndreas Schiermeier <andreas@schiermeier.name>
Sun, 10 Jul 2016 15:06:03 +0000 (17:06 +0200)
committerAndreas Schiermeier <andreas@schiermeier.name>
Sun, 10 Jul 2016 15:06:03 +0000 (17:06 +0200)
.gitmodules
modules/ntp [new submodule]
modules/persist/files/usr/local/sbin/git2puppet [new file with mode: 0644]
modules/persist/manifests/init.pp

index 401f206..b7c5234 100644 (file)
@@ -13,3 +13,6 @@
 [submodule "modules/cups"]
        path = modules/cups
        url = https://github.com/mosen/puppet-cups.git
+[submodule "modules/ntp"]
+       path = modules/ntp
+       url = https://github.com/puppetlabs/puppetlabs-ntp
diff --git a/modules/ntp b/modules/ntp
new file mode 160000 (submodule)
index 0000000..385e416
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 385e416269dfeb2729c09e9e986eddb473c5838b
diff --git a/modules/persist/files/usr/local/sbin/git2puppet b/modules/persist/files/usr/local/sbin/git2puppet
new file mode 100644 (file)
index 0000000..40c0786
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd /etc/puppet
+git pull
+git submodule init
+git submodule update
+puppet apply /etc/puppet/manifests/site.pp
+apt-get -y upgrade
+
index 5c18941..9695c33 100644 (file)
@@ -2,7 +2,7 @@ class persist {
 
        file { '/usr/local/sbin/git2puppet':
                ensure => present,
-               content => "#!/bin/bash\ncd /etc/puppet && git pull && git submodule init && git submodule update && puppet apply /etc/puppet/manifests/site.pp\napt-get -y upgrade",
+               source => 'puppet:///modules/persist/usr/local/sbin/git2puppet',
                mode => '0755',
        }