5 files changed, 40 insertions, 2 deletions
diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp
index 038b503..c927062 100644
--- a/manifests/subsystem/apt.pp
+++ b/manifests/subsystem/apt.pp
@@ -14,7 +14,8 @@ class nodo::subsystem::apt {
 
   ::apt::sources_list { "${::domain}.list":
     source => [ "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::lsbdistcodename}/${::domain}.list",
-                "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::domain}.list", ],
+                "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::domain}.list",
+                "puppet:///modules/nodo/etc/sources.list.d/domain.list", ],
     ensure => $apt_domain_source ? {
       true    => present,
       default => absent,
diff --git a/manifests/subsystem/gdm3/disabled.pp b/manifests/subsystem/gdm3/disabled.pp
new file mode 100644
index 0000000..117c530
--- /dev/null
+++ b/manifests/subsystem/gdm3/disabled.pp
@@ -0,0 +1,13 @@
+class nodo::subsystem::gdm3::disabled {
+  Package['gdm3'] {
+    ensure => absent,
+  }
+
+  Service['gdm3'] {
+    ensure => stopped,
+  }
+
+  File['/etc/gdm3/greeter.gsettings'] {
+    ensure => absent,
+  }
+}
diff --git a/manifests/subsystem/lightdm.pp b/manifests/subsystem/lightdm.pp
new file mode 100644
index 0000000..ba10159
--- /dev/null
+++ b/manifests/subsystem/lightdm.pp
@@ -0,0 +1,10 @@
+class nodo::subsystem::lightdm {
+  package { 'lightdm':
+    ensure => present,
+  }
+
+  service { 'lightdm':
+    ensure  => running,
+    require => Package['lightdm'],
+  }
+}
diff --git a/manifests/subsystem/lightdm/disabled.pp b/manifests/subsystem/lightdm/disabled.pp
new file mode 100644
index 0000000..4b9e4d2
--- /dev/null
+++ b/manifests/subsystem/lightdm/disabled.pp
@@ -0,0 +1,9 @@
+class nodo::subsystem::lightdm::disabled {
+  Package['lightdm'] {
+    ensure => absent,
+  }
+
+  Service['lightdm'] {
+    ensure => stopped,
+  }
+}
diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp
index 1f97a36..dd6defa 100644
--- a/manifests/subsystem/monitor/master.pp
+++ b/manifests/subsystem/monitor/master.pp
@@ -13,8 +13,13 @@ class nodo::subsystem::monitor::master {
     default => 'absent',
   }
 
-  # Munin configuration for apache
+  # Legacy configuration
   file { '/etc/apache2/conf.d/munin':
+    ensure => absent,
+  }
+
+  # Munin configuration for apache
+  file { '/etc/apache2/conf.d/munin.conf':
     ensure  => present,
     owner   => root,
     group   => root,