rconf 0.9.22 → 0.9.23

Sign up to get free protection for your applications and to get access to all the features.
@@ -230,7 +230,6 @@ http {
230
230
  include mime.types;
231
231
  default_type application/octet-stream;
232
232
 
233
-
234
233
  sendfile on;
235
234
  keepalive_timeout 65;
236
235
 
@@ -242,97 +241,155 @@ http {
242
241
 
243
242
  server {
244
243
  ssi on;
245
- listen 3000;
244
+ listen 3080;
246
245
  server_name right-site.rightscale.local;
247
246
  root #{File.join(right_site_src_path, 'public')};
248
247
  passenger_enabled on;
249
248
  rails_env development;
250
249
 
250
+ # Sketchy Redirects
251
+ # Send sketchy references to the appropriate URL/port
252
+ location ~ /sketchy2-4/ {
253
+ proxy_pass http://46.137.105.242$request_uri;
254
+ }
255
+
251
256
  # POST and AJAX requests need to proxied directly to the library app
252
257
  #####################################################################
253
258
  set $is_library_direct "";
254
259
 
255
- # provisioning routes to the library
256
- if ($request_uri ~ ^/provisioning)
257
- {
258
- rewrite ^/provisioning(.*)$ /direct_library/provisioning$1 last;
259
- }
260
-
261
- if ($request_uri ~ ^/aria_provisioning_callbacks)
262
- {
263
- rewrite ^/aria_provisioning_callbacks(.*)$ /direct_library/aria_provisioning_callbacks$1 last;
264
- }
265
-
266
- # request is for a library related action
260
+ # request is for a library related action
267
261
  if ($request_uri ~ ^/library/)
268
262
  {
269
- set $is_library_direct L;
263
+ set $is_library_direct L;
270
264
  }
271
-
265
+
272
266
  # request is a POST
273
267
  if ($request_method = POST)
274
268
  {
275
- set $is_library_direct "${is_library_direct}P";
269
+ set $is_library_direct "${is_library_direct}P";
276
270
  }
277
-
271
+
278
272
  # request is an AJAX
279
273
  if ($http_x_requested_with = XMLHttpRequest)
274
+ {
275
+ set $is_library_direct "${is_library_direct}A";
276
+ }
277
+
278
+ # library Post and Ajax request should be directly proxied
279
+ if ( $is_library_direct ~ (LP|LPA|LA) )
280
280
  {
281
- set $is_library_direct "${is_library_direct}A";
281
+ rewrite ^/library/(.*)$ /direct_library/$1 last;
282
282
  }
283
283
 
284
- # library post request should be directly proxied
285
- if ($is_library_direct = LP)
284
+ location /direct_library/
286
285
  {
287
- rewrite ^/library/(.*)$ /direct_library/$1 last;
286
+ proxy_pass http://library.rightscale.local:8080/;
287
+ proxy_set_header X-Embedded on;
288
+ proxy_set_header X-Relative-Root library;
289
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
288
290
  }
289
291
 
290
- # library post ajax request should be directly proxied
291
- if ($is_library_direct = LPA)
292
+ location /library_rest/
292
293
  {
293
- rewrite ^/library/(.*)$ /direct_library/$1 last;
294
+ proxy_pass http://library.rightscale.local:8080/;
295
+ proxy_set_header X-Embedded on;
296
+ proxy_set_header X-Relative-Root library;
297
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
294
298
  }
295
299
 
296
- # library ajax request should be directly proxied
297
- if ($is_library_direct = LA)
300
+ location /library/publishing_assistant/image_upload_callback/
298
301
  {
299
- rewrite ^/library/(.*)$ /direct_library/$1 last;
302
+ proxy_pass http://library.rightscale.local:8080/publishing_assistant/image_upload_callback/;
303
+ proxy_set_header X-Relative-Root library;
304
+ proxy_set_header X-Embedded on;
305
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
300
306
  }
301
- #####################################################################
302
307
 
303
- location /direct_library/
308
+ location ~ ^/library/publishing_organizations/(.+)/image_upload_callback
304
309
  {
305
- proxy_pass http://library.rightscale.local:3001/;
310
+ proxy_pass http://library.rightscale.local:8080/publishing_organizations/$1/image_upload_callback?$args;
306
311
  proxy_set_header X-Relative-Root library;
307
312
  proxy_set_header X-Embedded on;
308
- proxy_set_header X-Core-Site-Domain right-site.rightscale.local;
313
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
309
314
  }
310
315
 
311
- location ~ ^/library/users/(.+)/openid_consume
316
+ # library static assets get proxied directly to the library app
317
+ location ~ ^/library/(.*)\.(css|js)$ {
318
+ proxy_pass http://library.rightscale.local:8080/$1.$2;
319
+ }
320
+
321
+ # Library images are sent straight to the library
322
+ location /library_images/ {
323
+ proxy_pass http://library.rightscale.local:8080/library_images/;
324
+ }
325
+
326
+ location /api/reporting/
312
327
  {
313
- proxy_pass http://library.rightscale.local:3001/users/$1/openid_consume?$args;
328
+ proxy_pass http://library.rightscale.local:8080/report_service_proxy/;
314
329
  proxy_set_header X-Relative-Root library;
315
330
  proxy_set_header X-Embedded on;
331
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
316
332
  }
317
333
 
334
+ #####################################################################
335
+ set $is_global_system_direct "";
318
336
 
319
- location ~ ^/library/(.*).(css|js)
337
+ # request is for a library related action
338
+ if ($request_uri ~ ^/global/)
320
339
  {
321
- # library assets get proxied directly to the library app
322
- proxy_pass http://library.rightscale.local:3001/$1.$2;
340
+ set $is_global_system_direct L;
341
+ }
342
+
343
+ # request is a POST
344
+ if ($request_method = POST)
345
+ {
346
+ set $is_global_system_direct "${is_global_system_direct}P";
347
+ }
348
+
349
+ # request is an AJAX
350
+ if ($http_x_requested_with = XMLHttpRequest)
351
+ {
352
+ set $is_global_system_direct "${is_global_system_direct}A";
323
353
  }
324
354
 
325
- location /library_images/
355
+ # library Post and Ajax request should be directly proxied
356
+ if ( $is_global_system_direct ~ (LP|LPA|LA) )
326
357
  {
327
- proxy_pass http://library.rightscale.local:3001/library_images/;
358
+ rewrite ^/global/(.*)$ /direct_global/$1 last;
328
359
  }
329
360
 
361
+ # provisioning routes to the library
362
+ if ($request_uri ~ ^/provisioning)
363
+ {
364
+ rewrite ^/provisioning(.*)$ /direct_global/provisioning$1 last;
365
+ }
330
366
 
331
- location /library_rest/
367
+ if ($request_uri ~ ^/aria_provisioning_callbacks)
368
+ {
369
+ rewrite ^/aria_provisioning_callbacks(.*)$ /direct_global/aria_provisioning_callbacks$1 last;
370
+ }
371
+
372
+ location /direct_global/
373
+ {
374
+ proxy_pass http://global.rightscale.local:8080/;
375
+ proxy_set_header X-Embedded on;
376
+ proxy_set_header X-Relative-Root global/;
377
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
378
+ }
379
+
380
+ location /global_rest/
381
+ {
382
+ proxy_pass http://global.rightscale.local:8080/;
383
+ proxy_set_header X-Relative-Root global/;
384
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
385
+ }
386
+
387
+ location ~ ^/global/users/(.+)/openid_consume
332
388
  {
333
- proxy_pass http://127.0.0.1:3001/;
334
- proxy_set_header X-Relative-Root library;
335
- proxy_set_header X-Core-Site-Domain right-site.rightscale.local;
389
+ proxy_pass http://global.rightscale.local:8080/users/$1/openid_consume?$args;
390
+ proxy_set_header X-Relative-Root global;
391
+ proxy_set_header X-Embedded on;
392
+ proxy_set_header X-Core-Site-Domain 'right-site.rightscale.local';
336
393
  }
337
394
  }
338
395
  server {
data/lib/rconf/version.rb CHANGED
@@ -13,7 +13,7 @@ module RightConf
13
13
 
14
14
  MAJOR = 0
15
15
  MINOR = 9
16
- BUILD = 22
16
+ BUILD = 23
17
17
 
18
18
  VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
19
19
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rconf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.22
4
+ version: 0.9.23
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-25 00:00:00.000000000Z
12
+ date: 2012-09-27 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70104713356220 !ruby/object:Gem::Requirement
16
+ requirement: &70190382858140 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '2.5'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70104713356220
24
+ version_requirements: *70190382858140
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: flexmock
27
- requirement: &70104713355560 !ruby/object:Gem::Requirement
27
+ requirement: &70190382857500 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: '0.9'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70104713355560
35
+ version_requirements: *70190382857500
36
36
  description: ! 'rconf configures the environment for a given application. rconf reads
37
37
 
38
38
  the content of an application configuration file and installs and/or