diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-02-28 18:57:07 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-02-28 18:57:07 -0300 |
| commit | d2331dfe6d46e7e1f824e7692828411e4b7d7d28 (patch) | |
| tree | a6a6d9422c834f77784be4bd7b4d3dfe24850a0d /manifests | |
| parent | f73fad85330e4b41d48a6a2ad664372a3fa83fc7 (diff) | |
| download | puppet-bootstrap-d2331dfe6d46e7e1f824e7692828411e4b7d7d28.tar.gz puppet-bootstrap-d2331dfe6d46e7e1f824e7692828411e4b7d7d28.tar.bz2 | |
Starting to refactor / site_ convention
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/classes/default_conf.pp | 32 | ||||
| -rw-r--r-- | manifests/host.pp | 17 | ||||
| -rw-r--r-- | manifests/master.pp | 20 |
3 files changed, 37 insertions, 32 deletions
diff --git a/manifests/classes/default_conf.pp b/manifests/classes/default_conf.pp index df416f9..ab8280d 100644 --- a/manifests/classes/default_conf.pp +++ b/manifests/classes/default_conf.pp @@ -156,22 +156,22 @@ class default_conf { # files in $default_puppet_conf_dir/files file { [ "$default_puppet_conf_dir/files", - "$default_puppet_conf_dir/modules/site-nginx", - "$default_puppet_conf_dir/modules/site-nginx/files", - "$default_puppet_conf_dir/modules/site-nagios", - "$default_puppet_conf_dir/modules/site-nagios/files", - "$default_puppet_conf_dir/modules/site-postfix", - "$default_puppet_conf_dir/modules/site-postfix/files", - "$default_puppet_conf_dir/modules/site-mail", - "$default_puppet_conf_dir/modules/site-mail/files", - "$default_puppet_conf_dir/modules/site-apache", - "$default_puppet_conf_dir/modules/site-apache/files", - "$default_puppet_conf_dir/modules/site-apache/files/vhosts", - "$default_puppet_conf_dir/modules/site-apache/files/htdocs", - "$default_puppet_conf_dir/modules/site-apache/files/htdocs/images", - "$default_puppet_conf_dir/modules/site-keys", - "$default_puppet_conf_dir/modules/site-keys/files", - "$default_puppet_conf_dir/modules/site-keys/files/ssl", ]: + "$default_puppet_conf_dir/modules/site_nginx", + "$default_puppet_conf_dir/modules/site_nginx/files", + "$default_puppet_conf_dir/modules/site_nagios", + "$default_puppet_conf_dir/modules/site_nagios/files", + "$default_puppet_conf_dir/modules/site_postfix", + "$default_puppet_conf_dir/modules/site_postfix/files", + "$default_puppet_conf_dir/modules/site_mail", + "$default_puppet_conf_dir/modules/site_mail/files", + "$default_puppet_conf_dir/modules/site_apache", + "$default_puppet_conf_dir/modules/site_apache/files", + "$default_puppet_conf_dir/modules/site_apache/files/vhosts", + "$default_puppet_conf_dir/modules/site_apache/files/htdocs", + "$default_puppet_conf_dir/modules/site_apache/files/htdocs/images", + "$default_puppet_conf_dir/modules/site_keys", + "$default_puppet_conf_dir/modules/site_keys/files", + "$default_puppet_conf_dir/modules/site_keys/files/ssl", ]: ensure => directory, owner => "puppet", group => "puppet", diff --git a/manifests/host.pp b/manifests/host.pp index 179dda8..eaa9e22 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -1,3 +1,10 @@ +# +# This file is intended to configure the initial +# machine wich will host the first puppetmaster +# virtual machine. +# + +# Import the needed config and modules import "config.pp" import "nodo" import "classes/admin_node.pp" @@ -5,13 +12,11 @@ import "classes/firewall.pp" import "classes/users.pp" import "classes/default_conf.pp" -include nodo::server +# The server role +include nodo::role::server -# creates vserver for administrative node +# Creates vserver for administrative node include admin_node -# creates firewall rules for administrative node's external acess +# Creates firewall rules for administrative node's external acess include firewall - -# creates a default puppet configuration in /usr/local/puppet/default-conf -include default_conf diff --git a/manifests/master.pp b/manifests/master.pp index 4aa3806..30f6dc2 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -1,13 +1,13 @@ +# +# This file is intended to configure the initial +# puppetmaster node. +# +# Once it's running it can setup all the other nodes. +# + +# Import the needed config and modules import "config.pp" import "nodo" -include git - -# puppet config -package { [ "puppet", "puppetmaster" ]: ensure => installed, } - -service { "puppetmaster": - ensure => stopped, - require => Package["puppetmaster"] -} - +# Include the master node configuration +include nodo::role::master |