Merge remote-tracking branch 'git.kebler.net/master' into giskard

# Conflicts:
#	all/modules/vscode.sh

giskard/.networks

@@ -0,0 +1,3 @@
+!238.kebler.net
+645.kebler.net
+3115.kebler.net

giskard/alias/apps

@@ -0,0 +1 @@
+alias term="GNOME_TERMINAL_SCREEN='' gnome-terminal"

giskard/function/backups

@@ -0,0 +1,44 @@
+#!/bin/bash
+giskard_opt_bu () {
+
+backup -s -o '\-v5' /opt /backup/opt/
+# trantor host needs to be in config file
+backup -s -o '\-v5' -u sysadmin -h trantor /opt /backup/giskard/opt
+
+}
+
+rbu-test () {
+echo sudo /usr/bin/rdiff-backup -v4 \
+--exclude-globbing-filelist /mnt/AllData/hacking/active/exclude.bac \
+--remote-schema "/usr/bin/ssh -T %s '/usr/bin/rdiff-backup --server'" \
+/mnt/AllData/hacking/active \
+xtrantor::/backup/giskard/active-hacking
+}
+
+bu-test () {
+/usr/bin/rdiff-backup -v4 \
+--exclude-globbing-filelist /mnt/AllData/hacking/active/exclude.bac \
+--remote-schema "/usr/bin/ssh -T -F $SSH_CONFIG %s '/usr/bin/rdiff-backup --server'" \
+/mnt/AllData/hacking/active \
+trantor::/backup/giskard/active-hacking
+}
+
+
+giskard_active_bu () {
+
+backup -s -o '\-v4' /mnt/AllData/hacking/active /backup/active/
+# trantor host needs to be in root's config file
+backup -s -o '\-v4' -u sysadmin -h trantor /mnt/AllData/hacking/active /backup/giskard/active-hacking
+}
+
+giskard_users_bu () {
+
+backup -s -o '\-v3' /mnt/AllData/users /backup/users
+# trantor host needs to be in root's config file
+#backup -s -o '\-v5' -u sysadmin -h trantor /mnt/AllData/hacking/active /media/sysadmin/snapshots/giskard/active-hacking
+}
+
+giskard_hacking_bu () {
+  sudo rsync --exclude *[C]ache* --exclude node_modules --exclude kernel/ --progress -aAru /mnt/AllData/hacking/ /backup/hacking  
+}
+

giskard/function/share

@@ -0,0 +1,6 @@
+
+module_load acl
+snd_share () {
+parent=${1:-$PWD}    
+share_dir -w -o sysadmin -g users $parent sysadmin david
+}

giskard/lang/node

@@ -0,0 +1 @@
+path_append /opt/node-apps/bin