Experiments part 3
authorAndreas Schiermeier <andreas@schiermeier.name>
Tue, 8 Dec 2015 08:08:45 +0000 (09:08 +0100)
committerAndreas Schiermeier <andreas@schiermeier.name>
Tue, 8 Dec 2015 08:08:45 +0000 (09:08 +0100)
modules/desktop/manifests/init.pp
modules/system/files/etc/NetworkManager/system-connections/ffm.freifunk.net [new file with mode: 0644]
modules/system/files/etc/NetworkManager/system-connections/wired [new file with mode: 0644]
modules/system/manifests/init.pp

index 22bf9d5..bb49acc 100644 (file)
@@ -1,5 +1,9 @@
 class desktop {
 
+       package { 'nodm':
+               ensure => installed,
+       }
+
        $packages = [
                'lxde',
                'iceweasel',
@@ -8,15 +12,8 @@ class desktop {
   
        package { $packages:
                ensure => installed,
+               require => Package['nodm'],
        }
 
-       package { 'kdm':
-               ensure => installed,
-       }
-
-       package { 'lightdm*':
-               ensure => absent,
-               require => Package['kdm'],
-       }
 
 }
diff --git a/modules/system/files/etc/NetworkManager/system-connections/ffm.freifunk.net b/modules/system/files/etc/NetworkManager/system-connections/ffm.freifunk.net
new file mode 100644 (file)
index 0000000..29366cc
--- /dev/null
@@ -0,0 +1,14 @@
+[connection]
+id=ffm.freifunk.net
+type=wifi
+
+[wifi]
+ssid=ffm.freifunk.net
+mode=infrastructure
+
+[ipv6]
+method=link-local
+
+[ipv4]
+method=auto
+may-fail=false
diff --git a/modules/system/files/etc/NetworkManager/system-connections/wired b/modules/system/files/etc/NetworkManager/system-connections/wired
new file mode 100644 (file)
index 0000000..a9c91cf
--- /dev/null
@@ -0,0 +1,10 @@
+[connection]
+id=wired
+type=ethernet
+
+[ipv6]
+method=link-local
+
+[ipv4]
+method=auto
+may-fail=false
index 3712350..591dd0b 100644 (file)
@@ -29,4 +29,25 @@ class system {
                require => Package['chrony'],
        }
 
+       package { 'networkmanager':
+               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'],
+       }
+
+       file { '/etc/NetworkManager/system-connections/wired':
+               source => 'puppet:///modules/system/etc/NetworkManager/system-connections/wired',
+               mode => 'a=,u=rw',
+               require => Package['networkmanager'],
+       }
+
+       package { 'wicd*':
+               ensure => absent,
+               require => Package['networkmanager'],
+       }
+
 }