diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-29 12:09:21 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-29 12:09:21 -0200 |
| commit | 8df4bf9d9b43701d6fd580333a059656a93714dd (patch) | |
| tree | aa3c4ed6ea7041ed4cc6123f30007537c977f512 | |
| parent | a33718262f9daea4742e806c06afea2cdbd6e94a (diff) | |
| download | puppet-websites-8df4bf9d9b43701d6fd580333a059656a93714dd.tar.gz puppet-websites-8df4bf9d9b43701d6fd580333a059656a93714dd.tar.bz2 | |
Major cleanup
| -rw-r--r-- | manifests/dev/php.pp | 7 | ||||
| -rw-r--r-- | manifests/dev/rails.pp | 4 | ||||
| -rw-r--r-- | manifests/hosting.pp | 0 | ||||
| -rw-r--r-- | manifests/hosting/admin.pp | 5 | ||||
| -rw-r--r-- | manifests/init.pp | 27 |
5 files changed, 0 insertions, 43 deletions
diff --git a/manifests/dev/php.pp b/manifests/dev/php.pp deleted file mode 100644 index 7cfd249..0000000 --- a/manifests/dev/php.pp +++ /dev/null @@ -1,7 +0,0 @@ -class websites::dev::php inherits websites::setup { - # Include the needed classes for website development - include php - - # Declare the needed classes for website development - class { 'drupal': } -} diff --git a/manifests/dev/rails.pp b/manifests/dev/rails.pp deleted file mode 100644 index ab62ab2..0000000 --- a/manifests/dev/rails.pp +++ /dev/null @@ -1,4 +0,0 @@ -class websites::dev::rails inherits websites::setup { - # Include the needed classes for website development - include apache::rails -} diff --git a/manifests/hosting.pp b/manifests/hosting.pp deleted file mode 100644 index e69de29..0000000 --- a/manifests/hosting.pp +++ /dev/null diff --git a/manifests/hosting/admin.pp b/manifests/hosting/admin.pp deleted file mode 100644 index 0dd546e..0000000 --- a/manifests/hosting/admin.pp +++ /dev/null @@ -1,5 +0,0 @@ -class websites::hosting::admin inherits websites::setup { - # Include the needed classes for admin interfaces - include trac - include git::gitweb -} diff --git a/manifests/init.pp b/manifests/init.pp index e9878eb..ec6c0cf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,31 +1,4 @@ class websites inherits websites::setup { - # Include the needed classes for website hosting - include php - include trac - include websvn - include rsync::rrsync - - # Declare the needed classes for website hosting - class { [ 'drupal', 'ikiwiki', 'pmwiki', 'hotglue', 'wordpress' ]: } - class { - 'viewvc': - root_parents => "/var/svn : svn"; - } - - $git_daemon = hiera('nodo::web::git_daemon', True) - - if $git_daemon != false { - class { 'git::gitweb': } - class { 'git::cgit': } - - apache::site { "git": - source => true, - docroot => '/var/git/repositories', - mpm => false, - tag => 'all', - } - } - apache::site { "images": docroot => "${apache::www_folder}/images", mpm => false, |