diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/modules/site_websites/manifests/init.pp | |
parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/modules/site_websites/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_websites/manifests/init.pp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/puppet/modules/site_websites/manifests/init.pp b/puppet/modules/site_websites/manifests/init.pp new file mode 100644 index 0000000..c98ca7d --- /dev/null +++ b/puppet/modules/site_websites/manifests/init.pp @@ -0,0 +1,21 @@ +class site_websites inherits websites::hosting { + # Website definitions: always use tagged resources + apache::site { "git": + source => true, + docroot => '/var/git/repositories', + mpm => false, + tag => 'all', + } + + #apache::site { "site": + # source => true, + # ticket => '001', + # docroot => '/var/www/site', + # tag => 'all', + #} + + #database::instance { "site": + # password => 'xxx', + # tag => 'all', + #} +} |