diff --git a/puppet/modules/colab/manifests/init.pp b/puppet/modules/colab/manifests/init.pp index d075dc7..d7096e1 100644 --- a/puppet/modules/colab/manifests/init.pp +++ b/puppet/modules/colab/manifests/init.pp @@ -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', } diff --git a/puppet/modules/colab/manifests/requirements.pp b/puppet/modules/colab/manifests/requirements.pp index 0f21b0f..c10e1cf 100644 --- a/puppet/modules/colab/manifests/requirements.pp +++ b/puppet/modules/colab/manifests/requirements.pp @@ -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 +} diff --git a/requirements.txt b/requirements.txt index 2af9420..e8e6ce2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 -- libgit2 0.21.2