Open Build Service

rubygem-nginx-controller.changes Changed

rubygem-nginx-controller.spec Changed

nginx-controller-2.2.0.gem/checksums.yaml.gz -> nginx-controller-2.3.0.gem/checksums.yaml.gz Changed

nginx-controller-2.2.0.gem/data/lib/nginx_controller/base_service.rb -> nginx-controller-2.3.0.gem/data/lib/nginx_controller/base_service.rb Changed

@@ -42,6 +42,26 @@
       raise 'unimplemented'
     end
 
+    def behind_cloudflare?
+      raise 'unimplemented'
+    end
+
+    def want_crowdsec?
+      ENV'CROWDSEC_LOG_PATH'.present?
+    end
+
+    def crowdsec_error_log
+      want_crowdsec? ? File.join(ENV'CROWDSEC_LOG_PATH', 'crowdsec.error.log') : nil
+    end
+
+    def crowdsec_access_log
+      want_crowdsec? ? File.join(ENV'CROWDSEC_LOG_PATH', 'crowdsec.access.log') : nil
+    end
+
+    def disable_crowdsec_bouncer?
+      ENV'DISABLE_CROWDSEC_BOUNCER'.to_s == 'true'
+    end
+
     def config_filename
       File.join('/etc/nginx/vhosts.d/', "#{name}.conf")
     end
@@ -107,7 +127,8 @@
       end
       File.open(config_filename, 'wb+') {|f| f.write(config)}
       begin
-        out = `nginx -t 2>&1`
+        conf_flag = ENV'NGINX_TEST_CONF'.present? ? "-c #{ENV'NGINX_TEST_CONF'}" : ""
+        out = `nginx -t #{conf_flag} 2>&1`
         raise StandardError.new(out) unless $?.success?
       rescue
         FileUtils.mv(config_filename, "#{config_filename}.err")

nginx-controller-2.2.0.gem/data/lib/nginx_controller/docker/service.rb -> nginx-controller-2.3.0.gem/data/lib/nginx_controller/docker/service.rb Changed

nginx-controller-2.2.0.gem/data/lib/nginx_controller/templates/default.erb -> nginx-controller-2.3.0.gem/data/lib/nginx_controller/templates/default.erb Changed

@@ -7,6 +7,15 @@
   access_log /storage/logs/default/access.log main;
   error_log  /storage/logs/default/error.log;
 
+  <% if want_crowdsec? %>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end %>
+
   root /srv/www/htdocs/;
 
   error_page 404 500 502 503 504  /index.html;
@@ -33,6 +42,15 @@
   ssl_protocols TLSv1.2 TLSv1.3;
   ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305;
 
+  <% if want_crowdsec? %>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end %>
+
   access_log /storage/logs/default/access.log main;
   error_log  /storage/logs/default/error.log;
 
@@ -51,6 +69,15 @@
 
   server_name <%= validation_host %>;
 
+  <% if want_crowdsec? %>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end %>
+  
   access_log /storage/logs/validation/access.log main;
   error_log  /storage/logs/validation/error.log;

nginx-controller-2.2.0.gem/data/lib/nginx_controller/templates/nginx.erb -> nginx-controller-2.3.0.gem/data/lib/nginx_controller/templates/nginx.erb Changed

@@ -4,6 +4,19 @@
 
   server_name <%= servername, aliases.flatten.uniq.join(' ') %>;
 
+  <% if want_crowdsec? -%>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end -%>
+
+  <% if behind_cloudflare? -%>
+  if ($is_behind_proxy = "0") { return 444; }
+  <% end -%>
+
   access_log <%= access_log %> main;
   error_log  <%= error_log %>;
 
@@ -24,12 +37,27 @@
 
 <% if ssl? && ssl_certs.any? -%>
 <% ssl_certs.each do | cert | -%>
+<% names = cert.names & servername, aliases.flatten.uniq -%>
+<% if names.any? -%>
 server {
   listen 443 ssl;
   http2 on;
   server_tokens off;
 
-  server_name <%= cert.names.join(' ') %>;
+  server_name <%= names.join(' ') %>;
+
+  <% if want_crowdsec? -%>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+  
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end -%>
+
+  <% if behind_cloudflare? -%>
+  if ($is_behind_proxy = "0") { return 444; }
+  <% end -%>
 
   access_log <%= access_log %> main;
   error_log  <%= error_log %>;
@@ -44,6 +72,7 @@
 }
 <% end -%>
 <% end -%>
+<% end -%>
 
 <% if auto_route -%>
 server {
@@ -52,6 +81,19 @@
 
   server_name <%= auto_route %>;
 
+  <% if want_crowdsec? -%>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+  
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end -%>
+
+  <% if behind_cloudflare? -%>
+  if ($is_behind_proxy = "0") { return 444; }
+  <% end -%>
+
   access_log <%= access_log %> main;
   error_log  <%= error_log %>;
 
@@ -82,6 +124,19 @@
 
   server_name <%= auto_route %>;
 
+  <% if want_crowdsec? -%>
+  access_log <%= crowdsec_access_log %> crowdsec;
+  error_log  <%= crowdsec_error_log %>;
+  
+  <% unless disable_crowdsec_bouncer? %>
+  include crowdsec_access.conf;
+  <% end %>
+  <% end -%>
+
+  <% if behind_cloudflare? -%>
+  if ($is_behind_proxy = "0") { return 444; }
+  <% end -%>
+  
   access_log <%= access_log %> main;
   error_log  <%= error_log %>;

nginx-controller-2.2.0.gem/metadata.gz -> nginx-controller-2.3.0.gem/metadata.gz Changed

Changes of Revision 19