Revert template errors introduced in commit 4dd435e

spec/classes/nginx_spec.rb

@@ -89,9 +89,46 @@
         :template => "nginx/conf.d/nginx.conf.erb"
       }
     end
+    let(:expected) do
+'# File Managed by Puppet 
+user www-data;
+worker_processes 8;
+
+error_log  /var/log/nginx/error.log;
+pid        /var/run/nginx.pid;
+
+events {
+  worker_connections 1024;
+  # 
+}
+
+http {
+  server_tokens off;
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  access_log  /var/log/nginx/access.log;
+
+  sendfile    on;
+  #tcp_nopush  on;
+  tcp_nodelay        on;
+  client_max_body_size 10m;
+  keepalive_timeout  65;
+  server_names_hash_bucket_size 64;
+  types_hash_max_size 1024;
+
+  gzip         on;
+  gzip_disable "MSIE [1-6]\.(?!.*SV1)";
+
+
+  include /etc/nginx/conf.d/*.conf;
+
+  include /etc/nginx/sites-available/*.conf;
+}
+'
+    end
     it 'should generate a valid template' do
-      content = catalogue.resource('file', 'nginx.conf').send(:parameters)[:content]
-      content.should match "user www-data"
+      should contain_file('nginx.conf').with_content(expected)
     end
   end
 

templates/conf.d/nginx.conf.erb

@@ -31,10 +31,5 @@ http {
 <% if scope.lookupvar('nginx::cdir') != '' %>
   include <%= scope.lookupvar('nginx::cdir')%>/*.conf;
 <% end %>
-<% if scope.lookupvar('::operatingsystem') =~ /(?i:Ubuntu|Debian|Mint)/ %>
-  include <%= scope.lookupvar('nginx::config_dir') %>/conf.d/*.conf;
-  include <%= scope.lookupvar('nginx::config_dir') %>/sites-enabled/*;
-<% else %>
   include <%= scope.lookupvar('nginx::vdir')%>/*.conf;
-<% end %>
 }