]> gitweb.fluxo.info Git - debian.git/commit
Merge commit '529cd5077e3d76c1d5b612bc146ab174d7143c30' as 'puppet'
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 18 Sep 2014 15:47:46 +0000 (12:47 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 18 Sep 2014 15:47:46 +0000 (12:47 -0300)
commit84baf3dfea376e4b35156acc682f93bfae7e23eb
tree570011bbabc460651c61640a9ecb07b2b83b21cf
parent12bedcb9dc59316fcbb38bf1592ef73dace30d15
parent529cd5077e3d76c1d5b612bc146ab174d7143c30
Merge commit '529cd5077e3d76c1d5b612bc146ab174d7143c30' as 'puppet'
63 files changed:
puppet/.gitignore
puppet/.mrconfig
puppet/LICENSE
puppet/Makefile
puppet/README.md
puppet/TODO.md
puppet/Vagrantfile
puppet/bin/dependencies
puppet/bin/mrconfig
puppet/bin/provision
puppet/bin/submodules
puppet/bin/subtrees
puppet/bin/symlinks
puppet/files/.empty
puppet/hiera.yaml
puppet/hiera/bootstrap.yaml
puppet/hiera/common.yaml
puppet/hiera/hiera.yaml
puppet/keys/public/.empty
puppet/keys/ssh/.empty
puppet/keys/ssl/.empty
puppet/manifests/bootstrap/configurator.pp
puppet/manifests/bootstrap/host.pp
puppet/manifests/bootstrap/master.pp
puppet/manifests/bootstrap/vagrant.pp
puppet/manifests/classes/websites.pp
puppet/manifests/hiera
puppet/manifests/modules.pp
puppet/manifests/nodes.pp
puppet/manifests/nodes/.empty
puppet/manifests/site.pp
puppet/modules/bootstrap
puppet/modules/site_apache/files/htdocs/images/.empty
puppet/modules/site_apache/files/vhosts/.empty
puppet/modules/site_keys/files/ssl/.empty
puppet/modules/site_mail/files/.empty
puppet/modules/site_nagios/files/.empty
puppet/modules/site_nginx/files/.empty
puppet/modules/site_postfix/files/.empty
puppet/puppet
puppet/templates/apache/htdocs/images/README.html.erb
puppet/templates/apache/htdocs/index.html.erb
puppet/templates/apache/htdocs/missing.html.erb
puppet/templates/apache/vhosts/git.erb
puppet/templates/apache/vhosts/lists.erb
puppet/templates/apache/vhosts/mail.erb
puppet/templates/apache/vhosts/nagios.erb
puppet/templates/apache/vhosts/wiki.erb
puppet/templates/etc/aliases.erb
puppet/templates/etc/nagios3/htpasswd.users.erb
puppet/templates/etc/nginx/domain.erb
puppet/templates/postfix/tls_policy.erb
puppet/templates/puppet/auth.conf.erb
puppet/templates/puppet/fileserver.conf.erb
puppet/templates/puppet/master.pp.erb
puppet/templates/puppet/nodes.pp.erb
puppet/templates/puppet/proxy.pp.erb
puppet/templates/puppet/puppet.conf.erb
puppet/templates/puppet/server.pp.erb
puppet/templates/puppet/storage.pp.erb
puppet/templates/puppet/test.pp.erb
puppet/templates/puppet/users.pp.erb
puppet/templates/puppet/web.pp.erb