Added software packages.

diff --git a/.gitmodules b/.gitmodules
index 99792e7..e7f58a5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "modules/concat"]
        path = modules/concat
        url = https://github.com/puppetlabs/puppetlabs-concat
+[submodule "modules/apt"]
+       path = modules/apt
+       url = https://github.com/puppetlabs/puppetlabs-apt

diff --git a/modules/apt b/modules/apt
new file mode 160000 (submodule)
index 0000000..caf5f7a
--- /dev/null
+++ b/modules/apt
@@ -0,0 +1 @@
+Subproject commit caf5f7a6976004e80e48631687105ba329ec4366

diff --git a/modules/desktop/files/etc/iceweasel/profile/prefs.js b/modules/desktop/files/etc/iceweasel/profile/prefs.js
new file mode 100644 (file)
index 0000000..4726435
--- /dev/null
+++ b/modules/desktop/files/etc/iceweasel/profile/prefs.js
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the browser is running,
+ * the changes will be overwritten when the browser exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ */
+user_pref("browser.cache.disk.capacity", 1024);
+user_pref("browser.cache.disk.smart_size.enabled", false);
+user_pref("browser.cache.disk.smart_size.first_run", false);
+user_pref("browser.cache.disk.smart_size.use_old_max", false);
+user_pref("browser.download.useDownloadDir", false);
+user_pref("browser.startup.homepage", "http://ccc-ffm.de/getting-started/");
+user_pref("privacy.donottrackheader.enabled", true);

diff --git a/modules/desktop/files/etc/skel/.bash_logout b/modules/desktop/files/etc/skel/.bash_logout
new file mode 100644 (file)
index 0000000..de4f5f7
--- /dev/null
+++ b/modules/desktop/files/etc/skel/.bash_logout
@@ -0,0 +1,7 @@
+# ~/.bash_logout: executed by bash(1) when login shell exits.
+
+# when leaving the console clear the screen to increase privacy
+
+if [ "$SHLVL" = 1 ]; then
+    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
+fi

diff --git a/modules/desktop/files/etc/skel/.profile b/modules/desktop/files/etc/skel/.profile
new file mode 100644 (file)
index 0000000..c9db459
--- /dev/null
+++ b/modules/desktop/files/etc/skel/.profile
@@ -0,0 +1,22 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+       . "$HOME/.bashrc"
+    fi
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi

diff --git a/modules/desktop/files/etc/skel/.xscreensaver b/modules/desktop/files/etc/skel/.xscreensaver
new file mode 100644 (file)
index 0000000..1f97504
--- /dev/null
+++ b/modules/desktop/files/etc/skel/.xscreensaver
@@ -0,0 +1 @@
+mode:  off

diff --git a/modules/desktop/manifests/init.pp b/modules/desktop/manifests/init.pp
index 0d99924..6e8012b 100644 (file)
--- a/modules/desktop/manifests/init.pp
+++ b/modules/desktop/manifests/init.pp
@@ -37,7 +37,25 @@ class desktop {
                ],
        }
 
-       package { 'lightdm':
+       file { '/etc/skel/Desktop/chromium-l10n.desktop':
+               source => '/usr/share/applications/chromium.desktop',
+               require => [
+                       Package['chromium'],
+                       File['/etc/skel/Desktop'],
+               ],
+       }
+
+       $dms = [
+               'lightdm*',
+               'kdm',
+               'gdm3',
+               'nodm',
+               'wdm',
+               'xdm',
+               'slim',
+       ]
+
+       package { $dms:
                ensure => absent,
                require => Package['lxde'],
        }
@@ -45,6 +63,22 @@ class desktop {
        $packages = [
                'iceweasel',
                'iceweasel-l10n-*',
+               'gstreamer1.0-libav',
+               'gstreamer1.0-plugins-good',
+               'flashplugin-nonfree',
+               'chromium',
+               'chromium-l10n',
+               'libreoffice',
+               'libreoffice-help',
+               'libreoffice-l10n',
+               'mythes',
+               'mythes-*',
+               'myspell',
+               'myspell-*',
+               'ttf-mscorefonts-installer',
+               'ttf-liberation',
+               'fonts-crosextra-carlito',
+               'fonts-crosextra-caladea',
        ]
   
        package { $packages:
@@ -103,7 +137,7 @@ class desktop {
                ensure => installed,
                require => [
                                Exec['add-architecture-i386'],
-                               Exec['aptget-update'],
+                               Exec['apt_update'],
                        ],
        }
 

diff --git a/modules/system/manifests/init.pp b/modules/system/manifests/init.pp
index 0e2f8a2..101c7bd 100644 (file)
--- a/modules/system/manifests/init.pp
+++ b/modules/system/manifests/init.pp
@@ -1,9 +1,40 @@
 class system {
 
+       include apt
+
+       class { 'apt':
+               purge => [
+                       'sources.list',
+                       'sources.list.d',
+                       'preferences',
+                       'preferences.d',
+               ],
+               sources => {
+                       'debian' => {
+                               location => 'http://ftp.de.debian.org/debian/',
+                               release => "${lsbdistcodename}",
+                               repos => 'main non-free contrib',
+                       },
+                       'debian-security' => {
+                               location => 'http://security.debian.org/',
+                               release => "${lsbdistcodename}-updates",
+                               repos => 'main non-free contrib',
+                       },
+                       'debian-volatile' => {
+                               location => 'http://ftp.de.debian.org/debian/',
+                               release => "${lsbdistcodename}-updates",
+                               repos => 'main non-free contrib',
+                       },
+               update => {
+                       frequency => 'always',
+               },
+       }
+       
+
        exec { 'add-architecture-i386':
                command => '/usr/bin/dpkg --add-architecture i386',
                unless => '/bin/fgrep -q i386 /var/lib/dpkg/arch',
-               notify => Exec['aptget-update'],
+               notify => Exec['apt_update'],
        }
 
        exec { 'aptget-update':