diff options
| author | elijah <elijah@riseup.net> | 2013-05-18 22:55:34 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-05-18 22:55:34 -0700 |
| commit | b3cd7fc827d51007053ae1077cda2a2fc78a48dc (patch) | |
| tree | 2c1948856c301c2cefc471135537a901b93743af /puppet | |
| parent | 450fb19a4df8f4740dcf077b585dbd77c096d133 (diff) | |
nickserver - ensure libssl-dev is installed before EventMachine gem is installed.
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 12 | ||||
| -rw-r--r-- | puppet/modules/site_nickserver/templates/nickserver.yml.erb | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index 4a80d8fd..03af4acb 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -39,12 +39,10 @@ class site_nickserver { # NICKSERVER CODE # - #file { '/srv/leap/nickserver': - # ensure => directory, - # owner => 'nickserver', - # group => 'nickserver', - # require => User['nickserver']; - #} + # libssl-dev must be installed before eventmachine gem in order to support TLS + package { + 'libssl-dev': ensure => installed; + } vcsrepo { '/srv/leap/nickserver': ensure => present, revision => 'origin/master', @@ -61,7 +59,7 @@ class site_nickserver { unless => '/usr/bin/bundle check', user => 'nickserver', timeout => 600, - require => [ Class['bundler::install'], Vcsrepo['/srv/leap/nickserver'] ], + require => [ Class['bundler::install'], Vcsrepo['/srv/leap/nickserver'], Package['libssl-dev'] ], notify => Service['nickserver']; } diff --git a/puppet/modules/site_nickserver/templates/nickserver.yml.erb b/puppet/modules/site_nickserver/templates/nickserver.yml.erb index ec1c22ed..b6e0b3bf 100644 --- a/puppet/modules/site_nickserver/templates/nickserver.yml.erb +++ b/puppet/modules/site_nickserver/templates/nickserver.yml.erb @@ -5,3 +5,6 @@ couch_user: <%= @couchdb_user %> couch_password: <%= @couchdb_password %> hkp_url: 'https://hkps.pool.sks-keyservers.net:/pks/lookup' port: <%= @nickserver_port %> +pid_file: '/var/run/nickserver' +user: 'nickserver' +log_file: '/var/log/nickserver.log' |