From 9b533e36ba65a4d450d252d3d84c553d3de99a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?chris=20fl=C3=B6=C3=9F?= Date: Fri, 8 Oct 2010 17:11:18 +0200 Subject: [PATCH] update various advabest configs, mainly nginx stuff --- .../nginx_conf/sites-available/adva-cms.org | 27 +++++++++++++++++++ .../sites-available/advabest.production | 3 +-- .../sites-available/globalize-rails.org | 27 +++++++++++++++++++ modules/advabest/manifests/nginx.pp | 15 ++++++++--- modules/advabest/manifests/puppet_hack.pp | 9 +++++++ 5 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 modules/advabest/files/nginx_conf/sites-available/adva-cms.org create mode 100644 modules/advabest/files/nginx_conf/sites-available/globalize-rails.org create mode 100644 modules/advabest/manifests/puppet_hack.pp diff --git a/modules/advabest/files/nginx_conf/sites-available/adva-cms.org b/modules/advabest/files/nginx_conf/sites-available/adva-cms.org new file mode 100644 index 0000000..7189351 --- /dev/null +++ b/modules/advabest/files/nginx_conf/sites-available/adva-cms.org @@ -0,0 +1,27 @@ +server { + listen 80; + server_name adva-cms.org; + access_log /home/application/projects/adva-cms.org/log/adva-cms.org.log; + root /home/application/projects/adva-cms.org/export; + index index.html index.htm; + + try_files $uri $uri/index.html $uri.html; + + #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; + + #location ~* ^/(javascripts|stylesheets|images/layout|images/colorbox|digital_contents) { + # expires max; + #} + #location /data/pricelists { + # root /home/application/projects/s_k/staging/shared; + # internal; + #} +} diff --git a/modules/advabest/files/nginx_conf/sites-available/advabest.production b/modules/advabest/files/nginx_conf/sites-available/advabest.production index 8e0b5d4..ab0a5ae 100644 --- a/modules/advabest/files/nginx_conf/sites-available/advabest.production +++ b/modules/advabest/files/nginx_conf/sites-available/advabest.production @@ -87,5 +87,4 @@ server { #} -} -} +#} diff --git a/modules/advabest/files/nginx_conf/sites-available/globalize-rails.org b/modules/advabest/files/nginx_conf/sites-available/globalize-rails.org new file mode 100644 index 0000000..a836eeb --- /dev/null +++ b/modules/advabest/files/nginx_conf/sites-available/globalize-rails.org @@ -0,0 +1,27 @@ +server { + listen 80; + server_name globalize-rails.org; + access_log /home/application/projects/globalize-rails.org/log/globalize-rails.org.log; + root /home/application/projects/globalize-rails.org/export; + index index.html index.htm; + + try_files $uri $uri/index.html $uri.html; + + #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; + + #location ~* ^/(javascripts|stylesheets|images/layout|images/colorbox|digital_contents) { + # expires max; + #} + #location /data/pricelists { + # root /home/application/projects/s_k/staging/shared; + # internal; + #} +} diff --git a/modules/advabest/manifests/nginx.pp b/modules/advabest/manifests/nginx.pp index f33be66..97b510e 100644 --- a/modules/advabest/manifests/nginx.pp +++ b/modules/advabest/manifests/nginx.pp @@ -45,14 +45,15 @@ "/opt/nginx/conf/sites-available": ensure => directory; "/opt/nginx/conf/sites-available/advabest.staging": - replace => false, source => "puppet:///advabest/nginx_conf/sites-available/advabest.staging"; "/opt/nginx/conf/sites-available/advabest.production": - replace => false, source => "puppet:///advabest/nginx_conf/sites-available/advabest.production"; "/opt/nginx/conf/sites-available/intranet.advabest.com": - replace => false, source => "puppet:///advabest/nginx_conf/sites-available/intranet.advabest.com"; + "/opt/nginx/conf/sites-available/globalize-rails.org": + source => "puppet:///advabest/nginx_conf/sites-available/globalize-rails.org"; + "/opt/nginx/conf/sites-available/adva-cms.org": + source => "puppet:///advabest/nginx_conf/sites-available/adva-cms.org"; # Sites-enabled "/opt/nginx/conf/sites-enabled": @@ -64,7 +65,13 @@ ensure => "/opt/nginx/conf/sites-available/advabest.production", require => File["/opt/nginx/conf/sites-available/advabest.production"]; "/opt/nginx/conf/sites-enabled/intranet.advabest.com": - ensure => "/opt/nginx/conf/sites-available/advabest.production", + ensure => "/opt/nginx/conf/sites-available/intranet.advabest.com", require => File["/opt/nginx/conf/sites-available/intranet.advabest.com"]; + "/opt/nginx/conf/sites-enabled/globalize-rails.org": + ensure => "/opt/nginx/conf/sites-available/globalize-rails.org", + require => File["/opt/nginx/conf/sites-available/globalize-rails.org"]; + "/opt/nginx/conf/sites-enabled/adva-cms.org": + ensure => "/opt/nginx/conf/sites-available/adva-cms.org", + require => File["/opt/nginx/conf/sites-available/adva-cms.org"]; } } diff --git a/modules/advabest/manifests/puppet_hack.pp b/modules/advabest/manifests/puppet_hack.pp new file mode 100644 index 0000000..30a2954 --- /dev/null +++ b/modules/advabest/manifests/puppet_hack.pp @@ -0,0 +1,9 @@ +class advabest::nginx { + # A hack to fix that fact that we can't figure out how + # to force control where puppet keeps it's pid file in + # ubuntu citizens + file { + "/var/lib/puppet/run/puppetd.pid": + ensure => "/var/puppet/run/puppetd.pid", + } +}