Fix apache proxy + test

Author: lermit

.fixtures.yml

@@ -5,6 +5,7 @@ fixtures:
     "firewall": "git://github.com/example42/puppet-firewall.git"
     "iptables": "git://github.com/example42/puppet-iptables.git"
     "concat": "git://github.com/example42/puppet-concat.git"
+    "apache": "git://github.com/example42/puppet-apache.git"
     "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
   symlinks:
     "tomcat": "#{source_dir}"

manifests/instance.pp

@@ -427,9 +427,9 @@
       fail('You must specify the parameter apache_vhost_server_name on your tomcat::install when apache_vhost_create == true')
     }
 
+    $proxy_alias = $array_instance_apache_vhost_proxy_alias
     apache::vhost { $instance_name:
-      server_name => $apache_vhost_server_name ,
-      proxy_alias => $array_instance_apache_vhost_proxy_alias,
+      server_name => $apache_vhost_server_name,
       template    => $apache_vhost_template,
       docroot     => $apache_vhost_docroot,
     }

spec/defines/tomcat_instance_spec.rb

@@ -8,6 +8,10 @@
     :http_port => 8080,
     :control_port => 8480,
   } }
+  let (:facts) { {
+    :operatingsystem => 'CentOS',
+    :osfamily        => 'RedHat',
+  } }
 
   describe 'Test CentOS usage' do
     let (:facts) { {
@@ -36,6 +40,35 @@
     it { should contain_file('instance_tomcat_defaults_tomcat_instance').with_path('/etc/default/tomcat6-tomcat_instance') }
   end
 
+  describe "Test apache vhost creation" do
+    let(:params) { {
+      :http_port           => 8080,
+      :control_port        => 8480,
+      :apache_vhost_create => true,
+      :apache_vhost_server_name => 'tomcat.example42.com',
+    } }
+
+    describe "Simple" do
+      it { should contain_file('/etc/httpd/conf.d/50-tomcat_instance.conf').with_content(/ProxyPass \/tomcat_instance http:\/\/localhost:8080\/tomcat_instance/) }
+      it { should contain_file('/etc/httpd/conf.d/50-tomcat_instance.conf').with_content(/ProxyPassReverse \/tomcat_instance http:\/\/localhost:8080\/tomcat_instance/) }
+    end
+
+    describe "With manager enabled" do
+      let(:params) { {
+        :http_port                => 8080,
+        :control_port             => 8480,
+        :apache_vhost_create      => true,
+        :apache_vhost_server_name => 'tomcat.example42.com',
+        :manager                  => true,
+      } }
+      it { should contain_apache__vhost('tomcat_instance').with_server_name('tomcat.example42.com') }
+      it { should contain_file('/etc/httpd/conf.d/50-tomcat_instance.conf').with_content(/ProxyPass \/tomcat_instance http:\/\/localhost:8080\/tomcat_instance/) }
+      it { should contain_file('/etc/httpd/conf.d/50-tomcat_instance.conf').with_content(/ProxyPassReverse \/tomcat_instance http:\/\/localhost:8080\/tomcat_instance/) }
+      it { should contain_file('/etc/httpd/conf.d/50-tomcat_instance.conf').with_content(/ProxyPassReverse \/manager http:\/\/localhost:8080\/manager/) }
+      it { should contain_file('/etc/httpd/conf.d/50-tomcat_instance.conf').with_content(/ProxyPassReverse \/manager http:\/\/localhost:8080\/manager/) }
+    end
+  end
+
 
 end