Experiments part 4
authorAndreas Schiermeier <andreas@schiermeier.name>
Tue, 8 Dec 2015 08:34:37 +0000 (09:34 +0100)
committerAndreas Schiermeier <andreas@schiermeier.name>
Tue, 8 Dec 2015 08:34:37 +0000 (09:34 +0100)
modules/desktop/files/etc/default/nodm [new file with mode: 0644]
modules/desktop/manifests/init.pp
modules/system/manifests/init.pp

diff --git a/modules/desktop/files/etc/default/nodm b/modules/desktop/files/etc/default/nodm
new file mode 100644 (file)
index 0000000..f746406
--- /dev/null
@@ -0,0 +1,21 @@
+# nodm configuration
+
+# Set NODM_ENABLED to something different than 'false' to enable nodm
+NODM_ENABLED=true
+
+# User to autologin for
+NODM_USER=guest
+
+# First vt to try when looking for free VTs
+NODM_FIRST_VT=7
+
+# X session
+NODM_XSESSION=/etc/X11/Xsession
+
+# Options for the X server
+NODM_X_OPTIONS='-nolisten tcp'
+
+# If an X session will run for less than this time in seconds, nodm will wait an
+# increasing bit of time before restarting the session.
+NODM_MIN_SESSION_TIME=60
+
index bb49acc..b230b46 100644 (file)
@@ -4,15 +4,43 @@ class desktop {
                ensure => installed,
        }
 
+       package { 'lxde':
+               ensure => installed,
+               require => Package['nodm'],
+       }
+
+       package { 'lightdm':
+               ensure => absent,
+               require => Package['lxde'],
+       }
+
        $packages = [
-               'lxde',
                'iceweasel',
                'iceweasel-l10n-*',
        ]
   
        package { $packages:
                ensure => installed,
-               require => Package['nodm'],
+       }
+
+       group { 'guest':
+               ensure => 'present'
+       }
+
+       user { 'guest':
+               ensure => 'present',
+               home => '/home/guest',
+               managehome => true,
+               gid => 'guest',
+               require => Group['guest'],
+       }
+
+       file { '/etc/default/nodm':
+               source => 'puppet:///modules/desktop/etc/default/nodm',
+               require => [
+                               Package['nodm'],
+                               User['guest'],
+                               ],
        }
 
 
index 591dd0b..eb55f36 100644 (file)
@@ -29,25 +29,25 @@ class system {
                require => Package['chrony'],
        }
 
-       package { 'networkmanager':
+       package { 'network-manager':
                ensure => installed,
        }
 
        file { '/etc/NetworkManager/system-connections/ffm.freifunk.net':
                source => 'puppet:///modules/system/etc/NetworkManager/system-connections/ffm.freifunk.net',
                mode => 'a=,u=rw',
-               require => Package['networkmanager'],
+               require => Package['network-manager'],
        }
 
        file { '/etc/NetworkManager/system-connections/wired':
                source => 'puppet:///modules/system/etc/NetworkManager/system-connections/wired',
                mode => 'a=,u=rw',
-               require => Package['networkmanager'],
+               require => Package['network-manager'],
        }
 
        package { 'wicd*':
                ensure => absent,
-               require => Package['networkmanager'],
+               require => Package['network-manager'],
        }
 
 }