From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 17 May 2016 12:52:57 +0200
Subject: update submodules so "rake test" doesnt complain anymore

---
 puppet/modules/apache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/apache/manifests/debian.pp')

diff --git a/puppet/modules/apache b/puppet/modules/apache
index 117bed9a..415e9504 160000
--- a/puppet/modules/apache
+++ b/puppet/modules/apache
@@ -1 +1 @@
-Subproject commit 117bed9a9263c21d253d86b667eb165948efdc24
+Subproject commit 415e9504f99dca3ccaa4dfd389dde24ad9d0e01c
-- 
cgit v1.2.3


From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:41:59 -0400
Subject: remove submodules in preparation for move to subrepos

Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6
---
 puppet/modules/apache | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 puppet/modules/apache

(limited to 'puppet/modules/apache/manifests/debian.pp')

diff --git a/puppet/modules/apache b/puppet/modules/apache
deleted file mode 160000
index 415e9504..00000000
--- a/puppet/modules/apache
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 415e9504f99dca3ccaa4dfd389dde24ad9d0e01c
-- 
cgit v1.2.3


From 4aff06cc2fecc0b59728d7fc825fb36394b847b7 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:45:58 -0400
Subject: git subrepo clone https://leap.se/git/puppet_apache
 puppet/modules/apache

subrepo:
  subdir:   "puppet/modules/apache"
  merged:   "415e950"
upstream:
  origin:   "https://leap.se/git/puppet_apache"
  branch:   "master"
  commit:   "415e950"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "1e79595"

Change-Id: Iba7353669969a09c0b4bbd63add67e3245b05ede
---
 puppet/modules/apache/manifests/debian.pp | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 puppet/modules/apache/manifests/debian.pp

(limited to 'puppet/modules/apache/manifests/debian.pp')

diff --git a/puppet/modules/apache/manifests/debian.pp b/puppet/modules/apache/manifests/debian.pp
new file mode 100644
index 00000000..6ae4cee8
--- /dev/null
+++ b/puppet/modules/apache/manifests/debian.pp
@@ -0,0 +1,44 @@
+### debian
+class apache::debian inherits apache::package {
+  $config_dir = '/etc/apache2'
+
+  Package[apache] {
+    name => 'apache2',
+  }
+  File[vhosts_dir] {
+    path => "${config_dir}/sites-enabled",
+  }
+  File[modules_dir] {
+    path => "${config_dir}/mods-enabled",
+  }
+  File[htpasswd_dir] {
+    path   => '/var/www/htpasswds',
+    group  => 'www-data',
+  }
+  File[default_apache_index] {
+    path => '/var/www/index.html',
+  }
+  file { 'apache_main_config':
+    path    => "${config_dir}/apache2.conf",
+    source  => [ "puppet:///modules/site_apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf",
+                "puppet:///modules/site_apache/config/Debian/${::fqdn}/apache2.conf",
+                "puppet:///modules/site_apache/config/Debian.${::lsbdistcodename}/apache2.conf",
+                'puppet:///modules/site_apache/config/Debian/apache2.conf',
+                "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf",
+                "puppet:///modules/apache/config/Debian/${::fqdn}/apache2.conf",
+                "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/apache2.conf",
+                'puppet:///modules/apache/config/Debian/apache2.conf' ],
+    require => Package['apache'],
+    notify  => Service['apache'],
+    owner   => root,
+    group   => 0,
+    mode    => '0644';
+  }
+  apache::config::global{ 'charset': }
+  apache::config::global{ 'security': }
+  file { 'default_debian_apache_vhost':
+    ensure  => absent,
+    path    => '/etc/apache2/sites-enabled/000-default',
+  }
+}
+
-- 
cgit v1.2.3