Experiments part 16
authorAndreas Schiermeier <andreas@schiermeier.name>
Thu, 10 Dec 2015 01:37:05 +0000 (02:37 +0100)
committerAndreas Schiermeier <andreas@schiermeier.name>
Thu, 10 Dec 2015 01:37:05 +0000 (02:37 +0100)
modules/system/files/etc/NetworkManager/system-connections/ffm.freifunk.net
modules/system/files/etc/NetworkManager/system-connections/wired
modules/system/files/etc/security/pam_mount.conf.xml
modules/system/manifests/init.pp

index 7df8ab9..281b596 100644 (file)
@@ -14,6 +14,8 @@
 
                <!-- Volume definitions -->
 
+<volume user="guest" fstype="tmpfs" mountpoint="/tmp/tmpfs-%(USER)" options="size=10M,uid=%(USER),mode=0700" />
+<volume user="guest" fstype="unionfs" mountpoint="/home/guest" options="dirs=/tmp/tmpfs-%(USER):/etc/skel=ro:/home/guest=ro" />
 
                <!-- pam_mount parameters: General tunables -->
 
@@ -39,7 +41,5 @@
 
 <mkmountpoint enable="1" remove="true" />
 
-<volume user="guest" fstype="tmpfs" mountpoint="/tmp/tmpfs-%(USER)" options="size=10M,uid=%(USER),mode=0700" />
-<volume user="guest" fstype="unionfs" mountpoint="/home/guest" options="dirs=/tmp/tmpfs-%(USER):/etc/skel=ro:/home/guest=ro" />
 
 </pam_mount>
index 9226be0..35b5752 100644 (file)
@@ -56,6 +56,13 @@ class system {
                ensure => installed,
        }
 
+       file { '/etc/network/interfaces':
+               ensure => file,
+               source => 'puppet:///modules/system/etc/network/interfaces',
+               mode => 'a=r',
+               require => Package['network-manager'],
+       }
+
        file { '/etc/NetworkManager/system-connections/ffm.freifunk.net':
                ensure => file,
                source => 'puppet:///modules/system/etc/NetworkManager/system-connections/ffm.freifunk.net',