Merge branch 'master' of github.com:TracyWebTech/colab

Sergio Oliveira
2 parents 6dca22c7 5fa03ac9
Showing 1 changed file with 7 additions and 1 deletions Show diff stats
puppet/modules/colab/manifests/init.pp
@@ -44,6 +44,12 @@ class colab {
     user      => 'colab',
   }
  
+  supervisor::app { 'punjab':
+    command   => '/home/vagrant/.virtualenvs/colab/bin/twistd -n -y punjab.tac',
+    directory => '/home/colab/colab/',
+    user      => 'colab',
+  }
+
   nginx::config { 'nginx':
     content => template('colab/nginx/extra_conf.erb'),
   }
@@ -51,4 +57,4 @@ class colab {
   nginx::site { '000-colab':
     content => template('colab/nginx/site_default.erb'),
   }
-}
 \ No newline at end of file
+}
...	...	@@ -44,6 +44,12 @@ class colab {
44	44	user => 'colab',
45	45	}
46	46
	47	+ supervisor::app { 'punjab':
	48	+ command => '/home/vagrant/.virtualenvs/colab/bin/twistd -n -y punjab.tac',
	49	+ directory => '/home/colab/colab/',
	50	+ user => 'colab',
	51	+ }
	52	+
47	53	nginx::config { 'nginx':
48	54	content => template('colab/nginx/extra_conf.erb'),
49	55	}
...	...	@@ -51,4 +57,4 @@ class colab {
51	57	nginx::site { '000-colab':
52	58	content => template('colab/nginx/site_default.erb'),
53	59	}
54		-}
55	60	\ No newline at end of file
	61	+}
...	...