added nginx support for hosteurope server. refactored

flooose · Jul 22, 2010 · 5ccf196 · 5ccf196
1 parent 102c50c
commit 5ccf196
Show file tree

Hide file tree

Showing 17 changed files with 426 additions and 32 deletions.
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
@@ -16,6 +16,7 @@
     # TODO: Refactor. Charlie needs postgres stuff, but it shouldn't be
     # named in b2c_test
     include servercharlie
+    include servercharlie::packages
     adva_users{"puppet-admin": username => "puppet-admin",}
 }
 
@@ -39,17 +40,20 @@
 node 'ext-con-sk-test' {
     #include puppet_client
     include base_configs
+    ext-con::adva_users{"application": username => "application",}
     #include gems_ext_con
     #include ree
     #include nginx
 }
 
 node /ext-con-sk-\d\d/ {
-    include base_configs
+    #include base_configs
+    ext-con::adva_users{"application": username => "application",}
 }
 
 node 'ds87-230-55-112' inherits default {
     include packages::ree
     include advabest::packages
-    #include advabest::gems
+    include advabest::gems
+    include advabest::nginx
 }
diff --git a/modules/advabest/files/init.d/nginx b/modules/advabest/files/init.d/nginx
@@ -0,0 +1,62 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:          nginx
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts the nginx web server
+# Description:       starts nginx using start-stop-daemon
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/opt/nginx/sbin/nginx
+NAME=nginx
+DESC=nginx
+
+test -x $DAEMON || exit 0
+
+# Include nginx defaults if available
+if [ -f /etc/default/nginx ] ; then
+	. /etc/default/nginx
+fi
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile /opt/nginx/logs/$NAME.pid \
+		--exec $DAEMON -- $DAEMON_OPTS || true
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --pidfile /opt/nginx/logs/$NAME.pid \
+		--exec $DAEMON || true
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/opt/nginx/logs/$NAME.pid --exec $DAEMON || true
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile \
+		/opt/nginx/logs/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS || true
+	echo "$NAME."
+	;;
+  reload)
+      echo -n "Reloading $DESC configuration: "
+      start-stop-daemon --stop --signal HUP --quiet --pidfile /opt/nginx/logs/$NAME.pid \
+          --exec $DAEMON || true
+      echo "$NAME."
+      ;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/modules/advabest/files/logrotate.d/nginx b/modules/advabest/files/logrotate.d/nginx
@@ -0,0 +1,13 @@
+/opt/nginx/logs/*.log {
+	daily
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+	postrotate
+		[ ! -f /opt/nginx/logs/nginx.pid ] || kill -USR1 `cat /opt/nginx/logs/nginx.pid`
+	endscript
+}
diff --git a/modules/advabest/files/nginx_conf/advabest.production b/modules/advabest/files/nginx_conf/advabest.production
@@ -0,0 +1,71 @@
+server {
+  listen       				80;
+  server_name  				ext-b2c-sk-test;
+  access_log   				/home/application/projects/sk_b2c/testing/shared/log/nginx_access.log;
+  root				        /home/application/projects/sk_b2c/testing/current/public;
+  index        				index.html index.htm;
+
+  auth_basic            "Staging";
+  auth_basic_user_file  staging.sk.htpasswd;
+
+  # passenger stuff
+  passenger_enabled   on;
+  rails_env           production;
+  rails_spawn_method smart-lv2;
+  rails_framework_spawner_idle_time 1800;
+  rails_app_spawner_idle_time 600;
+
+  #location ~* ^/(javascripts|stylesheets|images/layout|images/colorbox|digital_contents) {
+  #  expires max;
+  #}
+  #location /data/pricelists { 
+  #  root /home/application/projects/s_k/staging/shared;
+  #  internal;
+  #}
+  location /stylesheets/adva_core {
+    proxy_set_header   X-Sendfile-Type     X-Accel-Redirect;
+    alias /home/application/.bundle/ruby/1.8/bundler/gems/adva-cms2-75981a8194b3a07e833796d5110aa9d2b450dfbd-master/adva-core/public;
+    internal;
+  }
+
+  # For the app maintenance
+  if (-f $document_root/system/maintenance.html) {
+    rewrite ^(.*)$ /system/maintenance.html break;
+    return 503;
+  }
+}
+
+#server {
+#  listen                                443;
+#  server_name  				ext-con-sk-test.siewert-kau.de;
+#  access_log   				/home/application/projects/s_k/staging/shared/log/nginx_access.log;
+#  root        	 			/home/application/projects/s_k/staging/current/public;
+#  index        				index.html index.htm;
+#
+#  auth_basic            "Staging";
+#  auth_basic_user_file  staging.sk.htpasswd;
+#  
+#  # passenger stuff
+#  passenger_enabled   on;
+#  rails_env           staging;
+#  rails_spawn_method smart-lv2;
+#  rails_framework_spawner_idle_time 1800;
+#  rails_app_spawner_idle_time 600;
+#
+#  ssl                                   on;
+#  ssl_certificate                       /home/application/.ssh/siewert-kau.de.chained.crt;
+#  ssl_certificate_key                   /home/application/.ssh/siewert-kau.de.key;
+#
+#  location ~* ^/(javascripts|stylesheets|images/layout|images/colorbox|digital_contents) {
+#    expires max;
+#  }
+#  location /data/pricelists { 
+#    root /home/application/projects/s_k/staging/shared;
+#    internal;
+#  }
+#
+#  # For the app maintenance
+#  if (-f $document_root/system/maintenance.html) {
+#    rewrite ^(.*)$ /system/maintenance.html break;
+#  }
+#}
diff --git a/modules/advabest/files/nginx_conf/advabest.staging b/modules/advabest/files/nginx_conf/advabest.staging
@@ -0,0 +1,71 @@
+server {
+  listen       				80;
+  server_name  				ext-b2c-sk-test;
+  access_log   				/home/application/projects/sk_b2c/testing/shared/log/nginx_access.log;
+  root				        /home/application/projects/sk_b2c/testing/current/public;
+  index        				index.html index.htm;
+
+  auth_basic            "Staging";
+  auth_basic_user_file  staging.sk.htpasswd;
+
+  # passenger stuff
+  passenger_enabled   on;
+  rails_env           production;
+  rails_spawn_method smart-lv2;
+  rails_framework_spawner_idle_time 1800;
+  rails_app_spawner_idle_time 600;
+
+  #location ~* ^/(javascripts|stylesheets|images/layout|images/colorbox|digital_contents) {
+  #  expires max;
+  #}
+  #location /data/pricelists { 
+  #  root /home/application/projects/s_k/staging/shared;
+  #  internal;
+  #}
+  location /stylesheets/adva_core {
+    proxy_set_header   X-Sendfile-Type     X-Accel-Redirect;
+    alias /home/application/.bundle/ruby/1.8/bundler/gems/adva-cms2-75981a8194b3a07e833796d5110aa9d2b450dfbd-master/adva-core/public;
+    internal;
+  }
+
+  # For the app maintenance
+  if (-f $document_root/system/maintenance.html) {
+    rewrite ^(.*)$ /system/maintenance.html break;
+    return 503;
+  }
+}
+
+#server {
+#  listen                                443;
+#  server_name  				ext-con-sk-test.siewert-kau.de;
+#  access_log   				/home/application/projects/s_k/staging/shared/log/nginx_access.log;
+#  root        	 			/home/application/projects/s_k/staging/current/public;
+#  index        				index.html index.htm;
+#
+#  auth_basic            "Staging";
+#  auth_basic_user_file  staging.sk.htpasswd;
+#  
+#  # passenger stuff
+#  passenger_enabled   on;
+#  rails_env           staging;
+#  rails_spawn_method smart-lv2;
+#  rails_framework_spawner_idle_time 1800;
+#  rails_app_spawner_idle_time 600;
+#
+#  ssl                                   on;
+#  ssl_certificate                       /home/application/.ssh/siewert-kau.de.chained.crt;
+#  ssl_certificate_key                   /home/application/.ssh/siewert-kau.de.key;
+#
+#  location ~* ^/(javascripts|stylesheets|images/layout|images/colorbox|digital_contents) {
+#    expires max;
+#  }
+#  location /data/pricelists { 
+#    root /home/application/projects/s_k/staging/shared;
+#    internal;
+#  }
+#
+#  # For the app maintenance
+#  if (-f $document_root/system/maintenance.html) {
+#    rewrite ^(.*)$ /system/maintenance.html break;
+#  }
+#}
diff --git a/modules/advabest/files/nginx_conf/nginx.conf b/modules/advabest/files/nginx_conf/nginx.conf
@@ -0,0 +1,47 @@
+worker_processes  1;
+
+#error_log  logs/error.log;
+#pid        logs/nginx.pid;
+
+events {
+  worker_connections  1024;
+}
+
+http {
+  server_tokens off;
+  passenger_root /opt/ruby-ee/lib/ruby/gems/1.8/gems/passenger-2.2.14;
+  passenger_ruby /opt/ruby-ee/bin/ruby;
+  passenger_max_pool_size 8;
+  #passenger_root /usr/lib/ruby/gems/1.8/gems/passenger-2.2.8;
+  #passenger_ruby /usr/bin/ruby1.8;
+
+  include       mime.types;
+  default_type  application/octet-stream;
+
+  log_format  main  '$remote_addr - $remote_user [$time_local] $request '
+                    '"$status" $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  #access_log  logs/access.log;
+
+  server_names_hash_bucket_size 128;
+
+  sendfile          on;
+  tcp_nopush        on;
+  keepalive_timeout 65;
+  tcp_nodelay 	    on;
+
+  gzip  on;
+  gzip_http_version 1.1;
+  gzip_comp_level 3;
+  gzip_proxied any;
+  gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+  # make sure gzip does not lose large gzipped js or css files
+  # see http://blog.leetsoft.com/2007/7/25/nginx-gzip-ssl
+  gzip_buffers 16 8k;
+  gzip_disable "MSIE [1-6].(?!.*SV1)";
+
+  include /opt/nginx/conf/sites-enabled/*;
+
+} 
diff --git a/modules/advabest/files/nginx_conf/staging.sk.htpasswd b/modules/advabest/files/nginx_conf/staging.sk.htpasswd
@@ -0,0 +1 @@
+advademo:cZmlwfKQj4NTg
diff --git a/modules/advabest/manifests/gems.pp b/modules/advabest/manifests/gems.pp
@@ -1,4 +1,4 @@
-class advabest-dev-ds87-230-55-112::gems{
+class advabest::gems {
     package { 
         "actionmailer":
             ensure => "2.3.4",
@@ -35,7 +35,7 @@
             provider => gem;
         "ezcrypto":
             ensure => "0.7.2",
-            "provider => gem;":
+            provider => gem;
         "facter":
             ensure => "1.5.6",
             provider => gem;
@@ -70,7 +70,7 @@
             ensure => "2.8.1",
             provider => gem;
         "newrelic_rpm":
-            ensure => 2.10.5,
+            ensure => "2.10.5",
             provider => gem;
         "passenger":
             ensure => "2.2.14",
@@ -88,7 +88,7 @@
             ensure => "0.8.4",
             provider => gem;
         "puppet":
-            ensure => 0.24.8,
+            ensure => "0.24.8",
             provider => gem;
         "rack":
             ensure => "1.0.1",
@@ -106,7 +106,7 @@
             ensure => "1.7.0",
             provider => gem;
         "rmagick":
-            ensure => 2.12.2,
+            ensure => "2.12.2",
             provider => gem;
         "rspec":
             ensure => "1.3.0",