Added location to gitlab javascript in nginx

Conflicts: puppet/modules/colab/manifests/init.pp

Added location to gitlab javascript in nginx
Conflicts: puppet/modules/colab/manifests/init.pp
Charles Oliveira
1 parent 5072d8cb
Showing 1 changed file with 7 additions and 0 deletions Show diff stats
puppet/modules/colab/manifests/init.pp
@@ -85,4 +85,11 @@ class colab (
     directory => '/home/colab/',
     user      => 'colab',
   }
+
+  nginx::resource::location { 'gitlab':
+    ensure         => present,
+    vhost          => 'colab',
+    location       => '/gitlab/assets/',
+    location_alias => '/opt/gitlab/embedded/service/gitlab-rails/public/assets/',
+  }
 }
	@@ -85,4 +85,11 @@ class colab (		@@ -85,4 +85,11 @@ class colab (
85	directory => '/home/colab/',	85	directory => '/home/colab/',
86	user => 'colab',	86	user => 'colab',
87	}	87	}
		88	+
		89	+ nginx::resource::location { 'gitlab':
		90	+ ensure => present,
		91	+ vhost => 'colab',
		92	+ location => '/gitlab/assets/',
		93	+ location_alias => '/opt/gitlab/embedded/service/gitlab-rails/public/assets/',
		94	+ }
88	}	95	}