Installing punjab using puppet instead requirement

Sergio Oliveira
1 parent 1e3ffc10
Showing 3 changed files with 24 additions and 8 deletions Show diff stats
puppet/modules/colab/manifests/init.pp
puppet/modules/colab/manifests/requirements.pp
requirements.txt
@@ -45,8 +45,8 @@ class colab {
   }
  
   supervisor::app { 'punjab':
-    command   => '/home/vagrant/.virtualenvs/colab/bin/twistd -n -y punjab.tac',
-    directory => '/home/colab/colab/',
+    command   => 'twistd --nodaemon punjab',
+    directory => '/home/colab/',
     user      => 'colab',
   }
  
@@ -17,6 +17,27 @@ class colab::requirements {
     provider => pip,
     require  => Package['python-pip'],
   }
+
+  # XMPP connection manager
+  package { 'git+https://github.com/twonds/punjab@c96ffe4':
+    ensure   => installed,
+    provider => pip,
+    require  => Package['python-pip'],
+  }
+
+  # Punjab dep
+  package { 'Twisted':
+    ensure   => installed,
+    provider => pip,
+    require  => Package['python-pip'],
+  }
+
+  # Punjab dep
+  package { 'pyOpenSSL':
+    ensure   => installed,
+    provider => pip,
+    require  => Package['python-pip'],
+  }
  
   # links virtualenvwrapper to load automaticaly
   file { '/etc/bash_completion.d/virtualenvwrapper.sh':
@@ -53,4 +74,4 @@ class colab::requirements {
   package { 'libxslt1-dev':
     ensure => installed,
   }
-}
 \ No newline at end of file
+}
@@ -31,8 +31,3 @@ feedparser
 lxml
 grab
 transliterate
-
-# Punjab (XMPP conection manager) and deps
-git+https://github.com/twonds/punjab@c96ffe4
-Twisted==13.1.0
-pyOpenSSL==0.13
...	...	@@ -45,8 +45,8 @@ class colab {
45	45	}
46	46
47	47	supervisor::app { 'punjab':
48		- command => '/home/vagrant/.virtualenvs/colab/bin/twistd -n -y punjab.tac',
49		- directory => '/home/colab/colab/',
	48	+ command => 'twistd --nodaemon punjab',
	49	+ directory => '/home/colab/',
50	50	user => 'colab',
51	51	}
52	52
...	...
...	...	@@ -17,6 +17,27 @@ class colab::requirements {
17	17	provider => pip,
18	18	require => Package['python-pip'],
19	19	}
	20	+
	21	+ # XMPP connection manager
	22	+ package { 'git+https://github.com/twonds/punjab@c96ffe4':
	23	+ ensure => installed,
	24	+ provider => pip,
	25	+ require => Package['python-pip'],
	26	+ }
	27	+
	28	+ # Punjab dep
	29	+ package { 'Twisted':
	30	+ ensure => installed,
	31	+ provider => pip,
	32	+ require => Package['python-pip'],
	33	+ }
	34	+
	35	+ # Punjab dep
	36	+ package { 'pyOpenSSL':
	37	+ ensure => installed,
	38	+ provider => pip,
	39	+ require => Package['python-pip'],
	40	+ }
20	41
21	42	# links virtualenvwrapper to load automaticaly
22	43	file { '/etc/bash_completion.d/virtualenvwrapper.sh':
...	...	@@ -53,4 +74,4 @@ class colab::requirements {
53	74	package { 'libxslt1-dev':
54	75	ensure => installed,
55	76	}
56		-}
57	77	\ No newline at end of file
	78	+}
...	...
...	...	@@ -31,8 +31,3 @@ feedparser
31	31	lxml
32	32	grab
33	33	transliterate
34		-
35		-# Punjab (XMPP conection manager) and deps
36		-git+https://github.com/twonds/punjab@c96ffe4
37		-Twisted==13.1.0
38		-pyOpenSSL==0.13
...	...