summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicah <micah@leap.se>2013-05-22 23:19:11 +0200
committermicah <micah@leap.se>2013-05-22 23:19:11 +0200
commitb6f13776c45b826b42bb1297f2df8fac8cdad893 (patch)
treec4edd1de59fe763217a519280691cc1aadbf0fd8
parentaafeaecb26fbb05284558114332a89439261637b (diff)
parenta386d3862a581d502b9611bc9af0e144ac29e4f9 (diff)
Merge branch 'feature/add_missing_requirements' of /home/git/repositories/micah/leap_platform into develop
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp9
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp29
2 files changed, 26 insertions, 12 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 1dd346fd..7858dbfd 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -29,18 +29,21 @@ class site_webapp::couchdb {
content => template('site_webapp/couchdb.yml.admin.erb'),
owner => leap-webapp,
group => leap-webapp,
- mode => '0600';
+ mode => '0600',
+ require => Vcsrepo['/srv/leap/webapp'];
'/srv/leap-webapp/config/couchdb.yml.webapp':
content => template('site_webapp/couchdb.yml.erb'),
owner => leap-webapp,
group => leap-webapp,
- mode => '0600';
+ mode => '0600',
+ require => Vcsrepo['/srv/leap/webapp'];
'/srv/leap-webapp/logs/production.log':
owner => leap-webapp,
group => leap-webapp,
- mode => '0666';
+ mode => '0666',
+ require => Vcsrepo['/srv/leap/webapp'];
'/usr/local/sbin/migrate_design_documents':
source => 'puppet:///modules/site_webapp/migrate_design_documents',
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 80b7c271..92cf4b25 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -70,30 +70,37 @@ class site_webapp {
file {
'/srv/leap-webapp/public/provider.json':
content => $provider,
+ require => Vcsrepo['/srv/leap/webapp'],
owner => leap-webapp, group => leap-webapp, mode => '0644';
'/srv/leap-webapp/public/ca.crt':
ensure => link,
+ require => Vcsrepo['/srv/leap/webapp'],
target => '/usr/local/share/ca-certificates/leap_api.crt';
"/srv/leap-webapp/public/${api_version}":
ensure => directory,
+ require => Vcsrepo['/srv/leap/webapp'],
owner => leap-webapp, group => leap-webapp, mode => '0755';
"/srv/leap-webapp/public/${api_version}/config/":
ensure => directory,
+ require => Vcsrepo['/srv/leap/webapp'],
owner => leap-webapp, group => leap-webapp, mode => '0755';
"/srv/leap-webapp/public/${api_version}/config/eip-service.json":
content => $eip_service,
+ require => Vcsrepo['/srv/leap/webapp'],
owner => leap-webapp, group => leap-webapp, mode => '0644';
"/srv/leap-webapp/public/${api_version}/config/soledad-service.json":
content => $soledad_service,
+ require => Vcsrepo['/srv/leap/webapp'],
owner => leap-webapp, group => leap-webapp, mode => '0644';
"/srv/leap-webapp/public/${api_version}/config/smtp-service.json":
content => $smtp_service,
+ require => Vcsrepo['/srv/leap/webapp'],
owner => leap-webapp, group => leap-webapp, mode => '0644';
}
@@ -102,17 +109,20 @@ class site_webapp {
ensure => 'link',
target => $webapp['favicon'];
- '/srv/leap-webapp/app/assets/stylesheets/tail.scss':
- ensure => 'link',
- target => $webapp['tail_scss'];
+ '/srv/leap/webapp/app/assets/stylesheets/tail.scss':
+ ensure => 'link',
+ require => Vcsrepo['/srv/leap/webapp'],
+ target => $webapp['tail_scss'];
- '/srv/leap-webapp/app/assets/stylesheets/head.scss':
- ensure => 'link',
- target => $webapp['head_scss'];
+ '/srv/leap/webapp/app/assets/stylesheets/head.scss':
+ ensure => 'link',
+ require => Vcsrepo['/srv/leap/webapp'],
+ target => $webapp['head_scss'];
- '/srv/leap-webapp/public/img':
- ensure => 'link',
- target => $webapp['img_dir'];
+ '/srv/leap/webapp/public/img':
+ ensure => 'link',
+ require => Vcsrepo['/srv/leap/webapp'],
+ target => $webapp['img_dir'];
}
file {
@@ -121,6 +131,7 @@ class site_webapp {
owner => leap-webapp,
group => leap-webapp,
mode => '0600',
+ require => Vcsrepo['/srv/leap/webapp'],
notify => Service['apache'];
}