diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/afs/CellServDB b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/afs/CellServDB
deleted file mode 100644
index dbd238d7..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/afs/CellServDB
+++ /dev/null
@@ -1,2 +0,0 @@
->eof
-129.132.186.89 # sgv-afs-sur5r
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/afs/ThisCell b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/afs/ThisCell
deleted file mode 100644
index 37fb719b..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/afs/ThisCell
+++ /dev/null
@@ -1 +0,0 @@
-eof
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/krb5/krb5.conf b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/krb5/krb5.conf
deleted file mode 100644
index 3b8259cb..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/krb5/krb5.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[libdefaults]
- default_realm = EOF
-
-# The following krb5.conf variables are only for MIT Kerberos.
- krb4_config = /etc/krb.conf
- krb4_realms = /etc/krb.realms
- kdc_timesync = 1
- ccache_type = 4
- forwardable = true
- proxiable = true
- allow_weak_crypto = true
-
-[realms]
- EOF = {
- kdc = sgv-afs-sur5r.ethz.ch
- admin_server = sgv-afs-sur5r.ethz.ch
- }
-
-
-[login]
- krb4_convert = true
- krb4_get_tickets = false
-
-[logging]
- default = FILE:/var/log/krb5.log
- kdc = FILE:/var/log/krb5kdc/kdc.log
- admin_server = FILE:/var/log/krb5kdc/kadmin.log
-
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/JAS.pub b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/JAS.pub
deleted file mode 100644
index 222410d5..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/JAS.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/Gbl64LT3VD5hsVtk1w670S2gue1OaW9XLg/Vk/iBqsYYrLGZh+TXJsAsXOSF1sZH6QSdNlpzTPsno9KFCTQTNlYe0IrWPGRrFGw1or3M6OugJrMeSiMYQ5nhH6HMjhzCFHH8Xh4Yku8fgi3ejPpySW8umx7nBL7ndiEJ9Y+lixNWMirEPLpz9YufFm9u8GX6bPrmjIBz6EhfxaqJ2N/N6gQB+4PmNopzqWHm+n4LToA9N8qwetSfhgEg7DVaD9SrJNjNTGSgii6CritT9sF8ZBq5CZG58DTyrxCndhhHte5OCGMb5ENgO4OBHA0MrD56unHrdAZCCosa9rI+pIll abr@cltHome03
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/bugblue.pub b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
deleted file mode 100644
index cccbe02f..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/bugblue.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA17fnWJMTAuIvWcdnsasdfEkBabeXEhYaR03Qc/KBpS+iToSeUzlc5SeXoAczqSMsC0uYpDnhll9q3aAN82Xo06RI2ytd7TeXvFcVwzvXB+sNUsvtyPZ5Uyx7d2WTI87bm169KhGTJCaww8p+qa2UhkjOOaXZwMGjkHlvZ3WSZr5mLar9O3r4PG8SIqoFF0m+tcc2fcWIK3df3jWIk8g6j/jTaoIa18qsK/rtO90Ql20FMQJOZTKGKjHIOx2FLnXY5WKrXmXyyffgFpqi1rUAkCkjCKnm65fDjecn6FplzSUuZo/IB2GnHGNQVnNkU/18/G8KQKu9clkMxuUl8DYJBQ== bugblue@jabber.eof.name
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/docsteel.pub b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
deleted file mode 100644
index 4b40d089..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/docsteel.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1xfKoN8D3I0uGvc66E2cpnutdgALbSVIIWy0SBGV1ZLA4CehAL5BpMO0EI1TfH4LGgpjg+CnLXOSMd+bnvWjPTxGUbGcmK45UYCyn1LzSAfVKi9Mr06wbvQj0h5w1zEAwDqt63SHGjGOHO4TeCSrPxEROPMbZ1mP1ECsb4f+3WLWE5icbzOb/QMx2zNDd29rVvFJiJMOg4AiIs7pl/T7Qxg2yN6YlDIXSXLiE2i98O26kBNWRgAFcTNBqoUs5AkZ2F4LPUGbyuLpV+wtlpYcQXOUTLoRlKw+ovBQH3L6ae9n6+rFTIEEAS08C0MOzQPC3QjmfRMC8mxVkn22XnpHbQ== default
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/downhill.pub b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/downhill.pub
deleted file mode 100644
index bde07c29..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/downhill.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-dss 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 downhill@downhill.homelinux.net
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
deleted file mode 100644
index a1fcba83..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/files/ssh/sur5r@samsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAABAEApDTX05FmMS1ArryWL6MmgcQeRFRU6E4Rgg+cPTeBuHCtBnnUoCUw7lhD2OICHIzQnfyMQasJOHH/4PnsrAxyO1Lm4KtK3zsdSdA5auunxAy0n7PZwaRKDTXCgpfXvi7ZAlzA+Mq/OjqtltfqdJgToYKxWoehwmltlwibuU1fke2v85VcTbCQRAttc6+0Y+3fToyTWecZM+X0uCsz1B5s07CLrMddo3lPVAlhYStSCbHflsM6C+NQAbxlsjkVFavii7WDYMYOd5FU0jIJt2Fy6u7Lx0ubY6hgGsP+mDOCCaRGA0JdjvWctBruj227CLswtAnYIFxvPi82R/okfx2X4YPtbqUPyLaUbr0G93g+raJEr/uXbour+wRd0TewOLq4VstwOsDfj9pm0wMFyIbsY2y97k6UZc0TE5pu3USGyW9/ainy5zD4TK4Al8lMkDHil6eItlud66KDZ4p5n5gzwuBj+ZOpOcBD5ZqLqDKst3YlHx6EuA1ddObBTrfy/nGphYYhWl1rbJ9+XOhSD8f/LIr5mjLEpSta6rHS/3dpLpSRGIy8ReG0RLbfay/fS74Iw0rEGOe/XgrfNDT0VwsgJMNV81sReepk27DaFD/vES/iPAymbbId8e8IQ7kDbhV0yK0yTkCZ5capqa9HXcut0SFRVJYGxzGT+ji5o/DcyAcaQHK9IW5i89sp04aVtZO+KZZDd2GmcDy+v9+fmBsSx2AFsoOQSXX31jJVdAXNw8idTNb88/3XDZIIEl+1KJ8Pv4UFXBW72RArpOxOrsDZYQjtaLQ4ZjTP3h823ZrBh4W3osb1znS7x4MmWBLPkmLCS0zmN8nbqhKi5EsTmSheCjCzySGShkyeqSGRIRGFk5PUsgh7hYvE+f7BhWD6x8MHbuUp9y0ODQonp022Dc4WzTc6Aa023MSNRuwV373tOqPYveuoPXDTS6vzV3IjXfv9a844HIkUTZbErxkavGBN5TEMgrALJkc8LS6M6Zg8odou8N2vWoNaKPn/DC5+H+FxJ2PSrK93hfzRMgvFvPSFzzDnixUFJClSqxf1Wvx9OW2pUuePAXBlcuFhAAnWV6w7fkmII8+qGk3m438dt2Sq6owmItzqIeJ6bohMsb9ejxeDyfk9DAQwmjS7S+BY47bYgAfsesZNRnlbeffp4rP0MAx4KoUXoNzb8tl1Jljulq58C0e5+EzRILqOYLM7WytY3+giqxN4zQJsqDp3mgSUaZ5SEHnA8JVi77MvABSoVclrEaujSLVEkxTBOiR252SFUWp3lWbxpGzBjd7gX4JAiytJql5xr+o4+nCy2O2laE6c2xS7en6SVEgC7jWflCsbDfvy9U+w1qOxa0j9fXE9Rw== sur5r@samsa
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/manifest
deleted file mode 100755
index 7b4cc493..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/manifest
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-
-__directory /root/.ssh --mode 0700
-
-__file /root/.ssh/authorized_keys --mode 0600
-
-cd "$__type/files/ssh"
-for key in *; do
- require="__directory/root/.ssh" \
- __addifnosuchline ssh-$key --file /root/.ssh/authorized_keys \
- --line "$(cat "$key")"
-done
-
-for pkg in openafs-client openafs-krb5 krb5-user; do
- __package $pkg --state installed
-done
-
-# Kerberos Config
-__file /etc/krb5.conf --source "$__type/files/krb5/krb5.conf"
-
-# AFS config
-cd "$__type/files/afs"
-for afsconf in *; do
- __file /etc/openafs/$afsconf --source "$__type/files/afs/$afsconf"
-done
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_afs/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_afs/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/files/hostname b/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/files/hostname
deleted file mode 100644
index a4df6242..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/files/hostname
+++ /dev/null
@@ -1 +0,0 @@
-scheibe
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/files/slim-preseed b/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/files/slim-preseed
deleted file mode 100644
index 01448d74..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/files/slim-preseed
+++ /dev/null
@@ -1,4 +0,0 @@
-# Use slim, not gdm, if both are available
-# Setup for slim, but value is available for gdm as well:
-# gdm shared/default-x-display-manager select slim
-slim shared/default-x-display-manager select slim
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/manifest
deleted file mode 100755
index 7fbbe70f..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/manifest
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-#
-# Ensure hostname is setup
-#
-__file /etc/hostname --source "$__object/parameter/hostname"
-
-# All Linux distros have those
-for pkg in dvdbackup mplayer x11vnc xfmpc; do
- __package $pkg --state installed
-done
-
-case "$(cat "$__global/explorer/os")" in
- debian|ubuntu)
- require="__package/zsh" __user lyni --uid 1000 --shell /bin/zsh
-
- for pkg in chromium-browser xfce4 xtightvncviewer; do
- __package $pkg --state installed
- done
-
- # Make slim default desktop on Debian/Ubuntu
- __debconf_set_selections slim --file "$__type/files/slim-preseed"
- require="__debconf_set_selections/slim" __package_apt slim --state installed
- ;;
-esac
-
-# Including gaming fun - not within examples, too big for core inclusion :-p
-# __nico_dosbox
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/parameter/required b/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/parameter/required
deleted file mode 100644
index ecd88aee..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-hostname
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_desktop/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/files/slim-preseed b/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/files/slim-preseed
deleted file mode 100644
index 01448d74..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/files/slim-preseed
+++ /dev/null
@@ -1,4 +0,0 @@
-# Use slim, not gdm, if both are available
-# Setup for slim, but value is available for gdm as well:
-# gdm shared/default-x-display-manager select slim
-slim shared/default-x-display-manager select slim
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/manifest
deleted file mode 100644
index d339bdf3..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-__package mpd --state installed
-
-require="__package/mpd" __file /etc/mpd.conf --source "$__type/files/mpd.conf"
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/parameter/required b/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/parameter/required
deleted file mode 100644
index ecd88aee..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-hostname
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_mpd/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_network/files/interfaces-eth0 b/other/examples_needing_cleanup/nico/conf/type/__nico_network/files/interfaces-eth0
deleted file mode 100644
index 2a92eade..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_network/files/interfaces-eth0
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by cdist
-auto lo eth0
-
-iface lo inet loopback
-
-iface eth0 inet dhcp
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_network/files/interfaces-wlan0 b/other/examples_needing_cleanup/nico/conf/type/__nico_network/files/interfaces-wlan0
deleted file mode 100644
index 49508eb2..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_network/files/interfaces-wlan0
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-auto wlan0
-iface wlan0 inet dhcp
- wpa-ssid undef
- wpa-psk rotrussland
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_network/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_network/manifest
deleted file mode 100755
index 012c47f7..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_network/manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-case "$(cat "$__global/explorer/os")" in
- debian|ubuntu)
-
- interface="$(cat $__object/parameter/interface)"
-
- #
- # Only Debian and alike supported currently
- #
- destination=/etc/network/interfaces
- case "$interface" in
- eth0|wlan0)
- source="$__type/files/interfaces-${interface}"
- ;;
- *)
- echo "Unknown interface: $interface" >&2
- exit 1
- ;;
- esac
-
- __file "$destination" --source "$source"
- ;;
-esac
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_network/parameter/required b/other/examples_needing_cleanup/nico/conf/type/__nico_network/parameter/required
deleted file mode 100644
index b529896a..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_network/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-interface
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_network/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_network/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/files/slim-preseed b/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/files/slim-preseed
deleted file mode 100644
index 01448d74..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/files/slim-preseed
+++ /dev/null
@@ -1,4 +0,0 @@
-# Use slim, not gdm, if both are available
-# Setup for slim, but value is available for gdm as well:
-# gdm shared/default-x-display-manager select slim
-slim shared/default-x-display-manager select slim
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/manifest
deleted file mode 100755
index ed1a872b..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/manifest
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-__directory /home/services
-
-for nfsshare in audio video; do
- dir="/home/services/$nfsshare"
- __addifnosuchline nfs-$nfsshare --file /etc/fstab \
- --line "192.168.42.1:$dir $dir nfs defaults 0 0"
- require="__directory/home/services" __directory $dir
-done
-
-__directory /home/services/eingehend
-for nfsshare in bibliothek buch spiegel; do
- dir="/home/services/eingehend/$nfsshare"
- __addifnosuchline nfs-$nfsshare --file /etc/fstab \
- --line "192.168.42.1:$dir $dir nfs defaults,noauto 0 0"
- require="__directory/home/services" __directory $dir
-done
-
-case "$(cat "$__global/explorer/os")" in
- debian|ubuntu)
- __package nfs-common --state installed
- ;;
-
- fedora|archlinux)
- __package nfs-utils --state installed
- ;;
-esac
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_nfs_client/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_notebook/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_notebook/manifest
deleted file mode 100755
index 7b010230..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_notebook/manifest
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-require="__package/zsh" __user nico --uid 1000 --shell /bin/zsh
-
-#
-# Backup HD
-#
-for hd in usbhd eth-usbhd; do
- dir="/home/services/$hd"
- __addifnosuchline hd-$hd --file /etc/fstab \
- --line "/dev/mapper/$hd $dir auto defaults,noauto 0 0"
- __directory $dir
-done
-
-#
-# Standard everywhere packages
-#
-__nico_packages
-__motd
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_notebook/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_notebook/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_packages/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_packages/manifest
deleted file mode 100755
index a1e663f7..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_packages/manifest
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-for pkg in atop screen vim wget zsh; do
- __package "$pkg" --state installed
-done
-
-case "$(cat "$__global/explorer/os")" in
- fedora)
- __package nc --state installed
- ;;
- *)
- __package netcat --state installed
- ;;
-esac
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_packages/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_packages/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/files/sudo-nico b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/files/sudo-nico
deleted file mode 100644
index d904c319..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/files/sudo-nico
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Cdist managed file
-#
-
-# Personal one: nico, shared one: lyni
-User_Alias NICO = nico, lyni
-
-Defaults timestamp_timeout=5
-Defaults !tty_tickets
-
-# Give out permissions
-NICO ALL=(ALL) ALL
-NICO ALL=(ALL) NOPASSWD: /usr/sbin/pm-suspend
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/manifest
deleted file mode 100755
index 59315313..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-destination=/etc/sudoers.d/nico
-source="$__type/files/sudo-nico"
-
-require="__package/sudo" __file "$destination" --source "$source" --mode 0440
-
-__package sudo --state installed
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/gencode b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/gencode
deleted file mode 100644
index 74792abf..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/gencode
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-# USEFUL DESCRIPTION
-#
-
-#
-# This file should generate code on stdout, which will be collected by cdist
-# and run on the target.
-#
-# To tell cdist to make use of it, you need to make it executable (chmod +x)
-#
-#
-
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/manifest
deleted file mode 100644
index c696eda6..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/manifest
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-# USEFUL DESCRIPTION
-#
-
-#
-# This is the manifest, which can be used to create other objects like this:
-# __file /path/to/destination --source /from/where/
-#
-# To tell cdist to make use of it, you need to make it executable (chmod +x)
-#
-#
-
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/optional b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/optional
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/required b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/parameter/required
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_sudo/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/files/99-apt-nico b/other/examples_needing_cleanup/nico/conf/type/__nico_tee/files/99-apt-nico
deleted file mode 100644
index 8d6d7c82..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/files/99-apt-nico
+++ /dev/null
@@ -1,2 +0,0 @@
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "1";
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/files/hostname b/other/examples_needing_cleanup/nico/conf/type/__nico_tee/files/hostname
deleted file mode 100644
index a4df6242..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/files/hostname
+++ /dev/null
@@ -1 +0,0 @@
-scheibe
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/manifest b/other/examples_needing_cleanup/nico/conf/type/__nico_tee/manifest
deleted file mode 100755
index 4c614027..00000000
--- a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/manifest
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-
-
-__package unattended-upgrades --state installed
-
-__file /etc/apt/apt.conf.d/99-apt-nico \
- --source "$__type/files/99-apt-nico" \
- --mode 0644
diff --git a/other/examples_needing_cleanup/nico/conf/type/__nico_tee/singleton b/other/examples_needing_cleanup/nico/conf/type/__nico_tee/singleton
deleted file mode 100644
index e69de29b..00000000