move

1 files changed, 8 insertions, 60 deletions

diff --git a/manifests/site.pp b/manifests/site.pp
index 09cbca3..fbdad07 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,71 +2,15 @@ node 'busting.adrift.space' {
 
   include ::profiles::common
 
+  # to allow clone of repo as root
   class { 'ssh':
     permit_root_login => true,
   }
 
-  ensure_packages(['ruby'])
-
-  class { 'puppet':
-    server                => true,
-    # agent                 => false,
-    server_foreman        => false,
-    server_reports        => 'puppetdb',
-    server_storeconfigs   => true,
-    server_git_repo       => true,
-    server_git_repo_path  => '/var/lib/puppet.git',
-    server_external_nodes => '',
-  }
-
-  # class { 'puppet::server::puppetdb':
-  #   port => 8080,
-  # }
-
-  # exec { 'puppetdb ssl-setup':
-  #   creates => '/etc/puppetlabs/puppetdb/ssl/{ca,private,public}.pem'
-  # }
-
-  class { 'puppetdb':
-    listen_address => '::',
-    disable_ssl    => false,
-  }
-  # class { 'puppetdb::master::config': }
-
-  # https://forge.puppet.com/modules/puppet/puppetboard/readme
-  # Configure Apache
-  class { 'apache':
-    default_vhost => false,
-    purge_configs => true,
-  }
-
-  $wsgi = $facts['os']['family'] ? {
-    'Debian' => {
-      package_name => 'libapache2-mod-wsgi-py3',
-      mod_path     => '/usr/lib/apache2/modules/mod_wsgi.so',
-    },
-    default  => {}
-  }
-
-  class { 'apache::mod::wsgi':
-    * => $wsgi,
-  }
+  include ::profiles::puppetserver
+  include ::profiles::puppetdb
+  include ::profiles::puppetboard
 
-  # Configure puppetboard
-
-  class { 'puppetboard':
-    manage_git        => true,
-    manage_virtualenv => true,
-    require           => Class['puppetdb'],
-    puppetdb_port     => 8080,
-    python_loglevel   => 'info',
-    offline_mode      => true,
-  }
-
-  class { 'puppetboard::apache::vhost':
-    vhost_name => $::fqdn,
-    port       => 80,
-  }
 }
 
 node 'gandalf.adrift.space' {
@@ -76,6 +20,8 @@ node 'gandalf.adrift.space' {
   }
 
   include ::profiles::common
+  include ::profiles::client
+
   include ::losetup
   include ::profiles::xmonad
   include ::profiles::workstation
@@ -136,6 +82,8 @@ node 'gandalf.adrift.space' {
 node 'hornquist.se' {
 
   include ::profiles::common
+  include ::profiles::client
+
   include ::profiles::firewall
 
   ensure_packages([