diff options
author | Micah Anderson <micah@riseup.net> | 2013-05-23 12:26:46 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-05-23 12:26:46 -0400 |
commit | 8e1e75bafd5a9ae8dc67ee73eebbaafbf120d07e (patch) | |
tree | b8c7b1fb15579460a12356ee2e095398007d3e47 /puppet/modules/site_webapp/manifests/couchdb.pp | |
parent | b6f13776c45b826b42bb1297f2df8fac8cdad893 (diff) | |
parent | e0b591b063d3c49012a4266ee837737758f58dc2 (diff) |
Merge branch 'feature/switch-webapp-location' into develop
Conflicts:
puppet/modules/site_webapp/manifests/init.pp
Resolved lint differences
Change-Id: Ifbc535ec844222c9f6f0dd71ac12742230bb64ee
Diffstat (limited to 'puppet/modules/site_webapp/manifests/couchdb.pp')
-rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp index 7858dbfd..b4ef0980 100644 --- a/puppet/modules/site_webapp/manifests/couchdb.pp +++ b/puppet/modules/site_webapp/manifests/couchdb.pp @@ -25,21 +25,21 @@ class site_webapp::couchdb { $key_path = "${x509::variables::keys}/${cert_name}.key" file { - '/srv/leap-webapp/config/couchdb.yml.admin': + '/srv/leap/webapp/config/couchdb.yml.admin': content => template('site_webapp/couchdb.yml.admin.erb'), owner => leap-webapp, group => leap-webapp, mode => '0600', require => Vcsrepo['/srv/leap/webapp']; - '/srv/leap-webapp/config/couchdb.yml.webapp': + '/srv/leap/webapp/config/couchdb.yml.webapp': content => template('site_webapp/couchdb.yml.erb'), owner => leap-webapp, group => leap-webapp, mode => '0600', require => Vcsrepo['/srv/leap/webapp']; - '/srv/leap-webapp/logs/production.log': + '/srv/leap/webapp/logs/production.log': owner => leap-webapp, group => leap-webapp, mode => '0666', @@ -61,7 +61,7 @@ class site_webapp::couchdb { } exec { 'migrate_design_documents': - cwd => '/srv/leap-webapp', + cwd => '/srv/leap/webapp', command => '/usr/local/sbin/migrate_design_documents', require => Exec['bundler_update'], notify => Service['apache']; |