Rebased the deployment examples

7 files changed, 1 insertions, 59 deletions

diff --git a/deployments/00_11_22_33_44_55.json b/deployments/00:11:22:33:44:55.json
index 5526629e..5526629e 100644
--- a/deployments/00_11_22_33_44_55.json
+++ b/deployments/00:11:22:33:44:55.json
diff --git a/deployments/08:00:27:36:83:9b.json b/deployments/08:00:27:36:83:9b.json
deleted file mode 100644
index c6e4f698..00000000
--- a/deployments/08:00:27:36:83:9b.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "args" : {
-        "password" : "0000"
-    },
-    "pre" : {
-        "sh -c \"echo -n -e '[arch_offline]\nSigLevel = Optional TrustAll\nServer = http://localmirror.lan/archlinux/os/${arch}' >> /etc/pacman.conf\"" : null
-    },
-    "post" : {
-        "Setup openssh": {
-            "pacman -Syy --noconfirm openssh" : null
-        },
-        "Setup OpenVPN": {
-            "pacman -Syy --noconfirm openvpn" : null
-        },
-        "Setup autostarts": {
-            "systemctl enable dhcpcd" : null,
-            "systemctl enable openssh" : null,
-            "systemctl enable openvpn-client@testclient" : null
-        }
-    }
-}
diff --git a/deployments/default.json b/deployments/default.json
deleted file mode 100644
index c2d34267..00000000
--- a/deployments/default.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "args" : {
-        "password" : "<STDIN>",
-        "user" : "anton",
-        "_webbrowser" : "chromium",
-        "_window_manager" : "awesome",
-        "_keyboard_layout" : "sv-latin1"
-    },
-    "post" : {
-        "Install workstation packages": {
-            "pacman -Syy --noconfirm {_webbrowser} {_window_manager} openssh sshfs git dhclient ttf-freefont xorg-server xorg-xrandr xorg-xinit xterm nano wget pulseaudio pulseaudio-alsa pavucontrol smbclient cifs-utils xscreensaver" : null
-        },
-        "Enable autostarts": {
-            "systemctl enable dhcpcd" : null
-        },
-        "Setup desktop environment" : {
-            "sed -i 's/^twm &/#&/' /etc/X11/xinit/xinitrc" : null,
-            "sed -i 's/^xclock/#&/' /etc/X11/xinit/xinitrc" : null,
-            "sed -i 's/^xterm/#&/' /etc/X11/xinit/xinitrc" : null,
-            "sed -i 's/^exec xterm/#&/' /etc/X11/xinit/xinitrc" : null,
-            "sh -c \"echo 'setxkbmap se' >> /etc/X11/xinit/xinitrc\"" : null,
-            "sh -c \"echo 'xscreensaver -no-splash &' >> /etc/X11/xinit/xinitrc\"" : null,
-            "sh -c \"echo 'exec {_window_manager}' >> /etc/X11/xinit/xinitrc\"" : {"pass-args" : true},
-            "sh -c \"echo 'KEYMAP={_keyboard_layout}\nFONT=lat9w-16' >> /etc/vconsole.conf\"" : {"pass-args" : true},
-            "sh -c \"sed -i 's/{ \\\"open terminal\\\", terminal/{ \\\"Chromium\\\", \\\"chromium\\\" },\n     &1/' /etc/xdg/awesome/rc.lua\"" : null,
-            "sh -c \"sed -i 's/{ \\\"open terminal\\\", terminal/{ \\\"File handler\\\", \\\"nemo\\\" },\n     &1/' /etc/xdg/awesome/rc.lua\"" : null,
-            "sh -c \"sed -i 's/^globalkeys = gears.table.join(/&\n    awful.key({ modkey,    }, \\\"l\\\",  function() awful.spawn(\\\"xscreensaver-command -lock &\\\") end),\n/' /etc/xdg/awesome/rc.lua\"" : null,
-            "sh -c \"awk -i inplace -v RS='' '{gsub(/awful.key\\({ modkey,.*?}, \\\"Tab\\\",.*?\\\"client\\\"}\\),/, \\\"awful.key({ modkey,      }, \\\"Tab\\\",\\\n      function ()\\\n        awful.client.focus.byidx(-1)\\\n        if client.focus then\\\n          client.focus:raise()\\\n        end\\\n      end),\\\n    awful.key({ modkey, \\\"Shift\\\"    }, \\\"Tab\\\",\\\n    function ()\\\n      awful.client.focus.byidx(1)\\\n        if client.focus then\\\n           client.focus.raise()\\\n        end\\\n      end),\\\"); print}' /etc/xdg/awesome/rc.lua\"" : null,
-            "gsettings set org.nemo.desktop show-desktop-icons false" : null,
-            "xdg-mime default nemo.desktop inode/directory application/x-gnome-saved-search" : null
-        },
-        "Setup users" : {
-            "useradd -m -G wheel -s /bin/bash anton" : null,
-            "sh -c \"echo {user}:{password} | chpasswd\"" : {"pass-args" : true}
-        }
-    }
-}
diff --git a/deployments/08:00:27:6f:0c:25.json b/deployments/dns_server.json
index 423fe872..423fe872 100644
--- a/deployments/08:00:27:6f:0c:25.json
+++ b/deployments/dns_server.json
diff --git a/deployments/08:00:27:e0:e0:e6.json b/deployments/local_mirror.json
index 79347f8b..79347f8b 100644
--- a/deployments/08:00:27:e0:e0:e6.json
+++ b/deployments/local_mirror.json
diff --git a/deployments/9c:d6:43:ae:11:4f.json b/deployments/minimal_example.json
index ab988e44..ec5e7d1c 100644
--- a/deployments/9c:d6:43:ae:11:4f.json
+++ b/deployments/minimal_example.json
@@ -1,5 +1,5 @@
 {
-    "install ssh": {
+    "install cmatrix": {
         "pacman -Syy --noconfirm cmatrix" : null
     }
 }
diff --git a/deployments/08:00:27:d4:fd:ef.json b/deployments/router.json
index 48e038c0..48e038c0 100644
--- a/deployments/08:00:27:d4:fd:ef.json
+++ b/deployments/router.json