1 files changed, 18 insertions, 88 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c17a739..60470da 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -76,94 +76,24 @@ import "pureftpd"
 import "avahi"
 import "daap_server"
 import "infinoted"
+import "database"
+import "domain_check"
+import "firewall"
+import "schroot"
+import "onion"
+import "tunnel"
+import "pyroscope"
+import "websites"
+
+# Nodo class
+import "nodo.pp"
+
+# Definitions
+import "defines/monkeysphere_host.pp"
+import "defines/munin_node.pp"
+import "defines/ssh_config.pp"
+import "defines/ssh_create_key.pp"
+import "defines/ssh_known_hosts.pp"
 
 # Import subsystems
-import "subsystems/firewire.pp"
-import "subsystems/initramfs.pp"
-import "subsystems/motd.pp"
-import "subsystems/sudo.pp"
-import "subsystems/sysctl.pp"
-import "subsystems/ups.pp"
-import "subsystems/database.pp"
-import "subsystems/websites.pp"
-import "subsystems/munin.pp"
-import "subsystems/pam.pp"
-import "subsystems/xorg.pp"
-import "subsystems/gdm.pp"
-import "subsystems/gdm3.pp"
-import "subsystems/modprobe.pp"
-import "subsystems/hosts.pp"
-import "subsystems/locales.pp"
-import "subsystems/onion.pp"
-import "subsystems/tunnel.pp"
-import "subsystems/media.pp"
-import "subsystems/monkeysphere.pp"
-import "subsystems/keyboard.pp"
-import "subsystems/profile.pp"
-import "subsystems/schroot.pp"
-import "subsystems/resolver.pp"
-import "subsystems/domain.pp"
-import "subsystems/dhclient.pp"
-import "subsystems/mount.pp"
-import "subsystems/monitor.pp"
-import "subsystems/fstab.pp"
-import "subsystems/crypttab.pp"
 import "subsystems/ssh.pp"
-import "subsystems/utils.pp"
-import "subsystems/utils/debian.pp"
-import "subsystems/utils/desktop.pp"
-import "subsystems/utils/development.pp"
-import "subsystems/utils/dns.pp"
-import "subsystems/utils/firmware.pp"
-import "subsystems/utils/hamradio.pp"
-import "subsystems/utils/interface.pp"
-import "subsystems/utils/java.pp"
-import "subsystems/utils/laptop.pp"
-import "subsystems/utils/multimedia.pp"
-import "subsystems/utils/network.pp"
-import "subsystems/utils/office.pp"
-import "subsystems/utils/personal.pp"
-import "subsystems/utils/physical.pp"
-import "subsystems/utils/plug.pp"
-import "subsystems/utils/ruby.pp"
-import "subsystems/utils/security.pp"
-import "subsystems/utils/storage.pp"
-import "subsystems/utils/web.pp"
-import "subsystems/utils/tor.pp"
-import "subsystems/firewall.pp"
-import "subsystems/firewall/printer.pp"
-import "subsystems/firewall/router.pp"
-import "subsystems/firewall/vserver.pp"
-import "subsystems/firewall/torrent.pp"
-import "subsystems/firewall/ups.pp"
-import "subsystems/firewall/wifi.pp"
-import "subsystems/firewall/local.pp"
-import "subsystems/firewall/openvpn.pp"
-import "subsystems/firewall/ppp.pp"
-import "subsystems/firewall/nas.pp"
-import "subsystems/firewall/redirect.pp"
-import "subsystems/firewall/mpd.pp"
-
-# Import nodo classes
-import "nodo.pp"
-import "physical.pp"
-import "server.pp"
-import "personal.pp"
-import "desktop.pp"
-import "vserver.pp"
-import "web.pp"
-import "master.pp"
-import "proxy.pp"
-import "storage.pp"
-import "test.pp"
-import "removable.pp"
-import "laptop.pp"
-import "plug.pp"
-import "appliance.pp"
-import "dns.pp"
-import "tor.pp"
-import "kvm.pp"
-import "jabber.pp"
-import "mumble.pp"
-import "yacy.pp"
-import "nas.pp"