From efa029b0ba85f9e5b33d8e1de2821d1b11ae04f3 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 18 Mar 2015 13:10:37 +0200
Subject: [PATCH] nginx: Manually merge nginx from parameterize

---
 nginx/files/passenger.conf     |   3 -
 nginx/manifests/init.pp        | 157 +++++++++++++++------------------
 nginx/templates/nginx.conf.erb |   8 +-
 3 files changed, 73 insertions(+), 95 deletions(-)
 delete mode 100644 nginx/files/passenger.conf

diff --git a/nginx/files/passenger.conf b/nginx/files/passenger.conf
deleted file mode 100644
index 33ef779..0000000
--- a/nginx/files/passenger.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-passenger_root /usr/local/lib/phusion_passenger;
-passenger_ruby /usr/local/bin/ruby18;
-passenger_log_level 1;
diff --git a/nginx/manifests/init.pp b/nginx/manifests/init.pp
index adeb33a..faed91b 100644
--- a/nginx/manifests/init.pp
+++ b/nginx/manifests/init.pp
@@ -1,106 +1,89 @@
 # Install and configure nginx.
 #
-class nginx {
+class nginx(
+  $workers=$::processorcount,
+) {
 
-    case $::operatingsystem {
-        "openbsd": {
-            $user = "_nginx"
-            $group = "_nginx"
-        }
-        default: {
-            $user = "nginx"
-            $group = "nginx"
-        }
+  case $::operatingsystem {
+    'openbsd': {
+      if $::kernelversion == '5.6' {
+        $user = 'www'
+        $group = 'www'
+      } else {
+        $user = '_nginx'
+        $group = '_nginx'
+      }
     }
-
-    package { "nginx":
-        ensure => installed,
+    default: {
+      $user = 'nginx'
+      $group = 'nginx'
     }
+  }
 
-    service { "nginx":
-        ensure  => running,
-        enable  => true,
-        require => Package["nginx"],
+  if ! ($::operatingsystem == 'OpenBSD' and $::kernelversion == '5.6') {
+    package { 'nginx':
+      ensure => installed,
+      before => File['/etc/nginx/nginx.conf', '/etc/nginx/conf.d'],
     }
+  }
 
-    file { "/etc/nginx/nginx.conf":
-        ensure  => present,
-        mode    => "0644",
-        owner   => "root",
-        group   => $::operatingsystem ? {
-            "openbsd" => "wheel",
-            default   => "root",
-        },
-        content => template("nginx/nginx.conf.erb"),
-        notify  => Service["nginx"],
-        require => Package["nginx"],
-    }
+  file { '/etc/nginx/nginx.conf':
+    ensure  => present,
+    mode    => '0644',
+    owner   => 'root',
+    group   => $::operatingsystem ? {
+      'openbsd' => 'wheel',
+      default   => 'root',
+    },
+    content => template('nginx/nginx.conf.erb'),
+    notify  => Service['nginx'],
+  }
 
-    file { "/etc/nginx/conf.d":
-        ensure  => directory,
-        mode    => "0644",
-        owner   => "root",
-        group   => $::operatingsystem ? {
-            "openbsd" => "wheel",
-            default   => "root",
-        },
-        purge   => true,
-        force   => true,
-        recurse => true,
-        source  => "puppet:///modules/custom/empty",
-        require => Package["nginx"],
-    }
+  file { '/etc/nginx/conf.d':
+    ensure  => directory,
+    mode    => '0644',
+    owner   => 'root',
+    group   => $::operatingsystem ? {
+      'openbsd' => 'wheel',
+      default   => 'root',
+    },
+    purge   => true,
+    force   => true,
+    recurse => true,
+    source  => 'puppet:///modules/custom/empty',
+    notify  => Service['nginx'],
+  }
 
-}
-
-
-# Install and configure nginx with passenger.
-#
-class nginx::passenger inherits nginx {
-
-    case $::operatingsystem {
-        "openbsd": {
-            Package["nginx"] {
-                flavor => "passenger",
-            }
-            nginx::configfile { "passenger.conf":
-                source => "puppet:///modules/nginx/passenger.conf",
-            }
-        }
-        default: {
-            fail("Not supported on ${::operatingsystem}")
-        }
-    }
+  service { 'nginx':
+    ensure => running,
+    enable => true,
+    start  => $::operatingsystem ? {
+      'openbsd' => '/usr/sbin/nginx -u',
+      default   => undef,
+    },
+  }
 
 }
 
 
 # Add nginx configuration file.
 #
-define nginx::configfile($source="", $content="") {
+define nginx::config(
+  $source=undef,
+  $content=undef,
+) {
 
-    file { "/etc/nginx/conf.d/${name}":
-        ensure  => present,
-        mode    => "0644",
-        owner   => "root",
-        group   => $::operatingsystem ? {
-            "openbsd" => "wheel",
-            default   => "root",
-        },
-        notify  => Service["nginx"],
-        require => File["/etc/nginx/conf.d"],
-    }
-
-    if $source {
-        File["/etc/nginx/conf.d/${name}"] {
-            source => $source,
-        }
-    }
-
-    if $content {
-        File["/etc/nginx/conf.d/${name}"] {
-            content => $content,
-        }
-    }
+  file { "/etc/nginx/conf.d/${name}":
+    ensure  => present,
+    mode    => '0644',
+    owner   => 'root',
+    group   => $::operatingsystem ? {
+      'openbsd' => 'wheel',
+      default   => 'root',
+    },
+    content => $content,
+    source  => $source,
+    notify  => Service['nginx'],
+  }
 
 }
diff --git a/nginx/templates/nginx.conf.erb b/nginx/templates/nginx.conf.erb
index 2630eaf..6f2bb90 100644
--- a/nginx/templates/nginx.conf.erb
+++ b/nginx/templates/nginx.conf.erb
@@ -1,5 +1,6 @@
 user <%= @user %>;
-worker_processes <%= @processorcount %>;
+worker_processes <%= @workers %>;
+worker_rlimit_nofile 1024;
 
 events {
     worker_connections 1024;
@@ -9,10 +10,7 @@ http {
     include mime.types;
     default_type application/octet-stream;
 
-    sendfile on;
-    tcp_nodelay on;
-    tcp_nopush on;
-    keepalive_timeout 65;
+    server_tokens off;
 
     include conf.d/*.conf;
 }