From 7be365029e1a6b2dd62548ff9b074b53d2a1ae6c Mon Sep 17 00:00:00 2001
From: Andreas Schiermeier <andreas@schiermeier.name>
Date: Sun, 10 Jul 2016 17:06:03 +0200
Subject: [PATCH] Moved git2puppet into a dedicated file.
---
.gitmodules | 3 +++
modules/ntp | 1 +
modules/persist/files/usr/local/sbin/git2puppet | 9 +++++++++
modules/persist/manifests/init.pp | 2 +-
4 files changed, 14 insertions(+), 1 deletion(-)
create mode 160000 modules/ntp
create mode 100644 modules/persist/files/usr/local/sbin/git2puppet
diff --git a/.gitmodules b/.gitmodules
index 401f206..b7c5234 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
index 0000000..385e416
--- /dev/null
+++ b/modules/ntp
@@ -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
index 0000000..40c0786
--- /dev/null
+++ b/modules/persist/files/usr/local/sbin/git2puppet
@@ -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
+
diff --git a/modules/persist/manifests/init.pp b/modules/persist/manifests/init.pp
index 5c18941..9695c33 100644
--- a/modules/persist/manifests/init.pp
+++ b/modules/persist/manifests/init.pp
@@ -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',
}
--
GitLab