update various advabest configs, mainly nginx stuff

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;
+  #}
+}

modules/advabest/files/nginx_conf/sites-available/advabest.production

@@ -87,5 +87,4 @@ server {
 #}
 
 
-}
-}
+#}

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;
+  #}
+}

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"];
     }
 }

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",
+    }
+}