Major cleanup

diff --git a/manifests/dev/php.pp b/manifests/dev/php.pp
deleted file mode 100644 (file)
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 (file)
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 (file)
index e69de29..0000000

diff --git a/manifests/hosting/admin.pp b/manifests/hosting/admin.pp
deleted file mode 100644 (file)
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 e9878eb5ecebea6f183f9c0d2b85a37bd58b7a37..ec6c0cfbd2ded7173f3b48e8ab885416dcd86cb9 100644 (file)
--- 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,