Commit b9a33c61c6ce4400e6a1d77d1c90b31b7874be64
1 parent
1e3ffc10
Exists in
master
and in
39 other branches
Installing punjab using puppet instead requirement
Showing
3 changed files
with
24 additions
and
8 deletions
Show diff stats
puppet/modules/colab/manifests/init.pp
| @@ -45,8 +45,8 @@ class colab { | @@ -45,8 +45,8 @@ class colab { | ||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | supervisor::app { 'punjab': | 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 | user => 'colab', | 50 | user => 'colab', |
| 51 | } | 51 | } |
| 52 | 52 |
puppet/modules/colab/manifests/requirements.pp
| @@ -17,6 +17,27 @@ class colab::requirements { | @@ -17,6 +17,27 @@ class colab::requirements { | ||
| 17 | provider => pip, | 17 | provider => pip, |
| 18 | require => Package['python-pip'], | 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 | # links virtualenvwrapper to load automaticaly | 42 | # links virtualenvwrapper to load automaticaly |
| 22 | file { '/etc/bash_completion.d/virtualenvwrapper.sh': | 43 | file { '/etc/bash_completion.d/virtualenvwrapper.sh': |
| @@ -53,4 +74,4 @@ class colab::requirements { | @@ -53,4 +74,4 @@ class colab::requirements { | ||
| 53 | package { 'libxslt1-dev': | 74 | package { 'libxslt1-dev': |
| 54 | ensure => installed, | 75 | ensure => installed, |
| 55 | } | 76 | } |
| 56 | -} | ||
| 57 | \ No newline at end of file | 77 | \ No newline at end of file |
| 78 | +} |
requirements.txt