[PATCH configure 1/2] Allow https to be toggled independently from all other security.

[Mike Orazi]

---
 bin/aeolus-cleanup                           |    2 ++
 bin/aeolus-configure                         |    2 ++
 recipes/aeolus_recipe/manifests/aeolus.pp    |    7 +++++++
 recipes/aeolus_recipe/manifests/conductor.pp |    2 +-
 recipes/apache/manifests/init.pp             |    3 ++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bin/aeolus-cleanup b/bin/aeolus-cleanup
index acf3fed..87fb405 100644
--- a/bin/aeolus-cleanup
+++ b/bin/aeolus-cleanup
@@ -1,7 +1,9 @@
 #!/bin/sh

+export FACTER_AEOLUS_ENABLE_HTTPS=true
 export FACTER_AEOLUS_ENABLE_SECURITY=false
 puppet /usr/share/aeolus-configure/aeolus_uninstall.pp \
        --modulepath=/usr/share/aeolus-configure/modules/ \
        --logdest=/var/log/aeolus-configure/aeolus-cleanup.log \
        --logdest=console
+
diff --git a/bin/aeolus-configure b/bin/aeolus-configure
index 34fa2ff..6d87cb1 100644
--- a/bin/aeolus-configure
+++ b/bin/aeolus-configure
@@ -1,7 +1,9 @@
 #!/bin/sh

+export FACTER_AEOLUS_ENABLE_HTTPS=true
 export FACTER_AEOLUS_ENABLE_SECURITY=false
 puppet /usr/share/aeolus-configure/aeolus_recipe.pp \
        --modulepath=/usr/share/aeolus-configure/modules/ \
        --logdest=/var/log/aeolus-configure/aeolus-configure.log \
        --logdest=console
+
diff --git a/recipes/aeolus_recipe/manifests/aeolus.pp b/recipes/aeolus_recipe/manifests/aeolus.pp
index 2b7d54e..de43f9c 100644
--- a/recipes/aeolus_recipe/manifests/aeolus.pp
+++ b/recipes/aeolus_recipe/manifests/aeolus.pp
@@ -11,6 +11,13 @@ import "deltacloud"
 import "iwhd"
 import "image-factory"

+if $aeolus_enable_https == "true" or $aeolus_enable_https == "1" {
+  import "openssl"
+  $enable_https = true
+} else {
+  $enable_https = false
+}
+
 if $aeolus_enable_security == "true" or $aeolus_enable_security == "1" {
   import "openssl"
   $enable_security = true
diff --git a/recipes/aeolus_recipe/manifests/conductor.pp b/recipes/aeolus_recipe/manifests/conductor.pp
index 4d0fe43..474424a 100644
--- a/recipes/aeolus_recipe/manifests/conductor.pp
+++ b/recipes/aeolus_recipe/manifests/conductor.pp
@@ -149,7 +149,7 @@ class aeolus::conductor inherits aeolus {

### Setup apache for deltacloud
     include apache
-    if $enable_security {
+    if $enable_https {
       apache::site{"aeolus-conductor": source => 'puppet:///modules/aeolus_recipe/aggregator-httpd-ssl.conf'}
     } else{
       apache::site{"aeolus-conductor": source => 'puppet:///modules/aeolus_recipe/aggregator-httpd.conf'}
diff --git a/recipes/apache/manifests/init.pp b/recipes/apache/manifests/init.pp
index dbecbf8..de703aa 100644
--- a/recipes/apache/manifests/init.pp
+++ b/recipes/apache/manifests/init.pp
@@ -5,7 +5,7 @@ class apache {
    # require apache and mod_ssl
    package { "httpd": ensure => installed }

-  if $enable_security {
+  if $enable_https {
      package { "mod_ssl": ensure => installed }
   }

@@ -40,3 +40,4 @@ define apache::site ( $ensure = 'present', $source = '') {
       require => Service['httpd']
    }
 }
+