Merge branch 'develop'

2 files changed, 17 insertions, 0 deletions

diff --git a/puppet/modules/apache b/puppet/modules/apache
deleted file mode 160000
-Subproject 117bed9a9263c21d253d86b667eb165948efdc2
diff --git a/puppet/modules/apache/manifests/config/include.pp b/puppet/modules/apache/manifests/config/include.pp
new file mode 100644
index 00000000..4d676f05
--- /dev/null
+++ b/puppet/modules/apache/manifests/config/include.pp
@@ -0,0 +1,17 @@
+# deploy apache configuration file (includes for vhosts)
+define apache::config::include(
+    $ensure = present,
+    $target = false,
+    $source = 'absent',
+    $content = 'absent',
+    $destination = 'absent'
+){
+    apache::config::file { "${name}":
+        ensure => $ensure,
+        target => $target,
+        type => 'include',
+        source => $source,
+        content => $content,
+        destination => $destination,
+    }
+}