diff options
| -rw-r--r-- | doc/tutorials/single-node-email.md | 2 | ||||
| -rw-r--r-- | platform.rb | 9 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/master.pp | 8 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 1 |
5 files changed, 15 insertions, 8 deletions
diff --git a/doc/tutorials/single-node-email.md b/doc/tutorials/single-node-email.md index 872d1da8..b47496b9 100644 --- a/doc/tutorials/single-node-email.md +++ b/doc/tutorials/single-node-email.md @@ -145,7 +145,7 @@ A "node" is a server that is part of your infrastructure. Every node can have on Create a node, with `all the services needed for Email: "couchdb", "mx", "soledad" and "webapp"` - $ leap node add node1 ip_address:x.x.x.w services:couchdb,mx,soledad,webapp + $ leap node add node1 ip_address:x.x.x.w services:couchdb,mx,soledad,webapp tags:production NOTE: replace x.x.x.w with the actual IP address of this node diff --git a/platform.rb b/platform.rb index bb77b0d9..82c25f8f 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ # Leap::Platform.define do - self.version = "0.7" + self.version = "0.7.1" self.compatible_cli = "1.7.0".."1.7.99" # @@ -75,8 +75,11 @@ Leap::Platform.define do :commercial_key => 'files/cert/#{arg}.key', :commercial_csr => 'files/cert/#{arg}.csr', :commercial_cert => 'files/cert/#{arg}.crt', - :commercial_ca_cert => 'files/cert/commercial_ca.crt', - :vagrantfile => 'test/Vagrantfile', + :commercial_ca_cert => 'files/cert/commercial_ca.crt', + :vagrantfile => 'test/Vagrantfile', + :static_web_provider_json => 'files/web/bootstrap/#{arg}/provider.json', + :static_web_htaccess => 'files/web/bootstrap/#{arg}/htaccess', + :static_web_readme => 'files/web/bootstrap/README', # node output files :hiera => 'hiera/#{arg}.yaml', diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index a11f6309..6b6ddd3a 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,3 +1,5 @@ +# entry class for configuring couchdb/bigcouch node +# couchdb node class site_couchdb { tag 'leap_service' @@ -41,6 +43,7 @@ class site_couchdb { $couchdb_backup = $couchdb_config['backup'] $couchdb_mode = $couchdb_config['mode'] + $couchdb_pwhash_alg = $couchdb_config['pwhash_alg'] if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch } if $couchdb_mode == 'master' { include site_couchdb::master } diff --git a/puppet/modules/site_couchdb/manifests/master.pp b/puppet/modules/site_couchdb/manifests/master.pp index a0a6633d..c28eee7d 100644 --- a/puppet/modules/site_couchdb/manifests/master.pp +++ b/puppet/modules/site_couchdb/manifests/master.pp @@ -1,9 +1,9 @@ +# this class sets up a single, plain couchdb node class site_couchdb::master { - class { 'couchdb': admin_pw => $site_couchdb::couchdb_admin_pw, admin_salt => $site_couchdb::couchdb_admin_salt, - chttpd_bind_address => '127.0.0.1' + chttpd_bind_address => '127.0.0.1', + pwhash_alg => $site_couchdb::couchdb_pwhash_alg } - -}
\ No newline at end of file +} diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index ce79c00f..35ecabf8 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -33,6 +33,7 @@ class site_static { include site_apache::module::expires include site_apache::module::removeip include site_apache::module::rewrite + apache::config::include{ 'ssl_common.inc': } if (member($formats, 'rack')) { include site_apt::preferences::passenger |