rconf 0.9.22 → 0.9.23

data/lib/rconf/configurators/passenger_configurator.rb

@@ -230,7 +230,6 @@ http {
     include       mime.types;
     default_type  application/octet-stream;
 
-
     sendfile          on;
     keepalive_timeout 65;
 
@@ -242,97 +241,155 @@ http {
 
     server {
         ssi on;
-        listen 3000;
+        listen 3080;
         server_name right-site.rightscale.local;
         root #{File.join(right_site_src_path, 'public')};
         passenger_enabled on;
         rails_env development;
 
+        # Sketchy Redirects
+        # Send sketchy references to the appropriate URL/port
+        location ~ /sketchy2-4/ {
+          proxy_pass  http://46.137.105.242$request_uri;
+        }
+
         # POST and AJAX requests need to proxied directly to the library app
         #####################################################################
         set $is_library_direct "";
 
-        # provisioning routes to the library
-        if ($request_uri ~ ^/provisioning)
-        {
-        rewrite ^/provisioning(.*)$ /direct_library/provisioning$1 last;
-        }
-
-        if ($request_uri ~ ^/aria_provisioning_callbacks)
-        {
-        rewrite ^/aria_provisioning_callbacks(.*)$ /direct_library/aria_provisioning_callbacks$1 last;
-        }
-
-        # request is for a library related action
+        # request is for a library related action      
         if ($request_uri ~ ^/library/)
         {
-            set $is_library_direct  L;
+          set $is_library_direct  L;
         }
-
+      
         # request is a POST
         if ($request_method = POST)
         {
-            set $is_library_direct "${is_library_direct}P";
+          set $is_library_direct "${is_library_direct}P";       
         }
-
+      
         # request is an AJAX
         if ($http_x_requested_with = XMLHttpRequest)
+        {      
+          set $is_library_direct "${is_library_direct}A";
+        }
+
+        # library Post and Ajax request should be directly proxied
+        if ( $is_library_direct ~ (LP|LPA|LA) )
         {
-            set $is_library_direct "${is_library_direct}A";
+          rewrite  ^/library/(.*)$  /direct_library/$1  last;
         }
 
-        # library post request should be directly proxied
-        if ($is_library_direct = LP)
+        location /direct_library/
         {
-            rewrite  ^/library/(.*)$  /direct_library/$1  last;
+           proxy_pass http://library.rightscale.local:8080/;
+           proxy_set_header   X-Embedded         on;
+           proxy_set_header   X-Relative-Root    library;
+           proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
         }
 
-        # library post ajax request should be directly proxied
-        if ($is_library_direct = LPA)
+        location /library_rest/
         {
-            rewrite  ^/library/(.*)$  /direct_library/$1  last;
+            proxy_pass http://library.rightscale.local:8080/;
+            proxy_set_header   X-Embedded         on;
+            proxy_set_header   X-Relative-Root    library;
+            proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
         }
 
-        # library ajax request should be directly proxied
-        if ($is_library_direct = LA)
+        location /library/publishing_assistant/image_upload_callback/
         {
-            rewrite  ^/library/(.*)$  /direct_library/$1  last;
+            proxy_pass http://library.rightscale.local:8080/publishing_assistant/image_upload_callback/;
+            proxy_set_header   X-Relative-Root    library;
+            proxy_set_header   X-Embedded         on;
+            proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
         }
-    #####################################################################
 
-        location /direct_library/
+        location ~ ^/library/publishing_organizations/(.+)/image_upload_callback
         {
-            proxy_pass http://library.rightscale.local:3001/;
+            proxy_pass http://library.rightscale.local:8080/publishing_organizations/$1/image_upload_callback?$args;
             proxy_set_header   X-Relative-Root    library;
             proxy_set_header   X-Embedded         on;
-            proxy_set_header   X-Core-Site-Domain    right-site.rightscale.local;
+            proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
         }
 
-        location ~ ^/library/users/(.+)/openid_consume
+        # library static assets get proxied directly to the library app   
+        location ~ ^/library/(.*)\.(css|js)$ {
+             proxy_pass http://library.rightscale.local:8080/$1.$2;
+        }
+
+        # Library images are sent straight to the library
+        location /library_images/ {
+             proxy_pass http://library.rightscale.local:8080/library_images/;
+        }
+
+        location /api/reporting/
         {
-            proxy_pass http://library.rightscale.local:3001/users/$1/openid_consume?$args;
+            proxy_pass http://library.rightscale.local:8080/report_service_proxy/;
             proxy_set_header   X-Relative-Root    library;
             proxy_set_header   X-Embedded         on;
+            proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
         }
 
+        #####################################################################
+        set $is_global_system_direct "";
 
-        location ~ ^/library/(.*).(css|js)
+        # request is for a library related action      
+        if ($request_uri ~ ^/global/)
         {
-          # library assets get proxied directly to the library app
-          proxy_pass http://library.rightscale.local:3001/$1.$2;
+          set $is_global_system_direct  L;
+        }
+      
+        # request is a POST
+        if ($request_method = POST)
+        {
+          set $is_global_system_direct "${is_global_system_direct}P";       
+        }
+      
+        # request is an AJAX
+        if ($http_x_requested_with = XMLHttpRequest)
+        {      
+          set $is_global_system_direct "${is_global_system_direct}A";
         }
 
-        location /library_images/
+        # library Post and Ajax request should be directly proxied
+        if ( $is_global_system_direct ~ (LP|LPA|LA) )
         {
-          proxy_pass http://library.rightscale.local:3001/library_images/;
+          rewrite  ^/global/(.*)$  /direct_global/$1  last;
         }
 
+        # provisioning routes to the library
+        if ($request_uri ~ ^/provisioning)
+        {
+            rewrite ^/provisioning(.*)$ /direct_global/provisioning$1 last;
+        }
 
-        location /library_rest/
+        if ($request_uri ~ ^/aria_provisioning_callbacks)
+        {
+            rewrite ^/aria_provisioning_callbacks(.*)$ /direct_global/aria_provisioning_callbacks$1 last;
+        }
+
+        location /direct_global/
+        {
+           proxy_pass http://global.rightscale.local:8080/;
+           proxy_set_header   X-Embedded         on;
+           proxy_set_header   X-Relative-Root    global/;
+           proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
+        }
+
+        location /global_rest/
+        {
+            proxy_pass http://global.rightscale.local:8080/;
+            proxy_set_header   X-Relative-Root    global/;
+            proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
+        }
+
+        location ~ ^/global/users/(.+)/openid_consume
         {
-          proxy_pass http://127.0.0.1:3001/;
-          proxy_set_header   X-Relative-Root    library;
-          proxy_set_header   X-Core-Site-Domain    right-site.rightscale.local;
+            proxy_pass http://global.rightscale.local:8080/users/$1/openid_consume?$args;
+            proxy_set_header   X-Relative-Root    global;
+            proxy_set_header   X-Embedded         on;
+            proxy_set_header   X-Core-Site-Domain 'right-site.rightscale.local';
         }
     }
     server {

data/lib/rconf/version.rb

@@ -13,7 +13,7 @@ module RightConf
 
   MAJOR = 0
   MINOR = 9
-  BUILD = 22
+  BUILD = 23
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000Z
+date: 2012-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70104713356220 !ruby/object:Gem::Requirement
+  requirement: &70190382858140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70104713356220
+  version_requirements: *70190382858140
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70104713355560 !ruby/object:Gem::Requirement
+  requirement: &70190382857500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70104713355560
+  version_requirements: *70190382857500
 description: ! 'rconf configures the environment for a given application. rconf reads
 
   the content of an application configuration file and installs and/or