From 5126584fe40f08b779a6f93e2d1b6b57bae29700 Mon Sep 17 00:00:00 2001
From: Tulio Casagrande <tcasagra@thoughtworks.com>
Date: Mon, 16 Jan 2017 15:15:41 -0200
Subject: Add apache auto-restart extension file

---
 puppet/modules/site_apache/files/auto_restart.conf        |  2 ++
 puppet/modules/site_apache/manifests/common.pp            |  1 +
 puppet/modules/site_apache/manifests/common/extensions.pp | 14 ++++++++++++++
 puppet/modules/site_apache/spec/classes/extensions.rb     |  7 +++++++
 puppet/modules/site_apache/spec/spec_helper.rb            |  6 ++++++
 5 files changed, 30 insertions(+)
 create mode 100644 puppet/modules/site_apache/files/auto_restart.conf
 create mode 100644 puppet/modules/site_apache/manifests/common/extensions.pp
 create mode 100644 puppet/modules/site_apache/spec/classes/extensions.rb
 create mode 100644 puppet/modules/site_apache/spec/spec_helper.rb

(limited to 'puppet/modules/site_apache')

diff --git a/puppet/modules/site_apache/files/auto_restart.conf b/puppet/modules/site_apache/files/auto_restart.conf
new file mode 100644
index 00000000..8a764e34
--- /dev/null
+++ b/puppet/modules/site_apache/files/auto_restart.conf
@@ -0,0 +1,2 @@
+[Service]
+Restart=always
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index 208c15d5..c96932dd 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -28,5 +28,6 @@ class site_apache::common {
 
   include site_apache::common::tls
   include site_apache::common::acme
+  include site_apache::common::extensions
 
 }
diff --git a/puppet/modules/site_apache/manifests/common/extensions.pp b/puppet/modules/site_apache/manifests/common/extensions.pp
new file mode 100644
index 00000000..ddeafae0
--- /dev/null
+++ b/puppet/modules/site_apache/manifests/common/extensions.pp
@@ -0,0 +1,14 @@
+class site_apache::common::extensions {
+
+  include ::systemd
+  file { '/etc/systemd/system/apache2.service.d/auto_restart.conf':
+    source  => 'puppet:///modules/site_apache/auto_restart.conf',
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    require => [
+      Service['apache']
+    ]
+  }~>
+  Exec['systemctl-daemon-reload']
+}
diff --git a/puppet/modules/site_apache/spec/classes/extensions.rb b/puppet/modules/site_apache/spec/classes/extensions.rb
new file mode 100644
index 00000000..164034c2
--- /dev/null
+++ b/puppet/modules/site_apache/spec/classes/extensions.rb
@@ -0,0 +1,7 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
+
+describe 'site_apache::common::extensions' do
+  it "should include apache autostart" do
+    should contain_file('/etc/systemd/system/apache2.service.d/auto_restart.conf').with_source('puppet:///modules/site_apache/apache_auto_restart.conf')
+  end
+end
diff --git a/puppet/modules/site_apache/spec/spec_helper.rb b/puppet/modules/site_apache/spec/spec_helper.rb
new file mode 100644
index 00000000..dea9e892
--- /dev/null
+++ b/puppet/modules/site_apache/spec/spec_helper.rb
@@ -0,0 +1,6 @@
+require 'rspec-puppet'
+
+RSpec.configure do |c|
+  c.module_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+  c.color = true
+end
-- 
cgit v1.2.3