oxidized 0.28.0 → 0.29.0

data/docs/Sources.md

@@ -85,6 +85,23 @@ source:
       enable: enable
 ```
 
+### MySQL with TLS support
+By default SSL is disabled, but if you would like enable connection via TLS add the following configuration:
+```yaml
+source:
+  default: sql
+  sql:
+    ...
+    with_ssl: true
+    ssl_mode: <mode>
+    ssl_ca: <path to CA certificate>
+    ssl_cert: <path to client certificate>
+    ssl_key: <path to client certificate key>
+```
+ssl_mode may be one of the next: disabled / preferred / required / verify_ca / verify_identity
+
+For more information visit: https://github.com/brianmario/mysql2
+
 ## Source: SQLite
 
 One row per device, filtered by hostname.
@@ -148,6 +165,7 @@ source:
     delimiter: !ruby/regexp /:/
     user: username
     pass: password
+    read_timeout: 120
     map:
       name: hostname
       model: os

data/docs/Supported-OS-Types.md

@@ -6,6 +6,8 @@
   * [ACOS](/lib/oxidized/model/acos.rb)
 * Accedian Performance Elements (NIDs)
   * [AEN](/lib/oxidized/model/aen.rb)
+* Acme Packet
+  * [ACMEPACKET](/lib/oxidized/model/acmepacket.rb)
 * Adtran
   * [Total Access (AOS)](/lib/oxidized/model/adtran.rb)
 * Alcatel-Lucent
@@ -28,6 +30,7 @@
 * Arris
   * [C4CMTS](/lib/oxidized/model/c4cmts.rb)
 * Aruba
+  * [AOS-CX](/lib/oxidized/model/aoscx.rb)
   * [AOSW](/lib/oxidized/model/aosw.rb)
 * AudioCodes
   * [AudioCodes](/lib/oxdized/model/audiocodes.rb)
@@ -35,6 +38,15 @@
 * Avaya
   * [VOSS (VSP Operating System Software)](/lib/oxidized/model/voss.rb)
   * [BOSS (Baystack Operating System Software)](/lib/oxidized/model/boss.rb)
+* BDCOM
+  * [S2200 series](/lib/oxidized/model/bdcom.rb)
+  * [S2200PB series](/lib/oxidized/model/bdcom.rb)
+  * [S2200-B series](/lib/oxidized/model/bdcom.rb)
+  * [S2500-B series](/lib/oxidized/model/bdcom.rb)
+  * [S2500-C series](/lib/oxidized/model/bdcom.rb)
+  * [S2500PB series](/lib/oxidized/model/bdcom.rb)
+  * [S2500-P series](/lib/oxidized/model/bdcom.rb)
+  * [S2900 series](/lib/oxidized/model/bdcom.rb)
 * Brocade
   * [FabricOS](/lib/oxidized/model/fabricos.rb)
   * [FastIron](/lib/oxidized/model/fastiron.rb)
@@ -47,6 +59,7 @@
   * [AXOS](/lib/oxidized/model/axos.rb)
 * Cambium
   * [Cambium (PMP450 Series)](/lib/oxidized/model/cambium.rb)
+  * [Cambium (ePMP Series)](/lib/oxidized/model/cambiumepmp.rb)
 * Casa
   * [Casa](/lib/oxidized/model/casa.rb)
 * Centec Networks
@@ -61,7 +74,8 @@
   * [ASA](/lib/oxidized/model/asa.rb)
   * [AsyncOS](/lib/oxidized/model/asyncos.rb)
   * [CatOS](/lib/oxidized/model/catos.rb)
-  * [FireLinuxOS](lib/oxidized/model/firelinuxos.rb)
+  * [Cisco Catalyst Express](/lib/oxidized/model/ciscoce.rb)
+  * [FireLinuxOS](/lib/oxidized/model/firelinuxos.rb)
   * [IOS](/lib/oxidized/model/ios.rb)
   * [IOSXR](/lib/oxidized/model/iosxr.rb)
   * [NGA](/lib/oxidized/model/cisconga.rb)
@@ -96,11 +110,15 @@
 * ECI Telecom
   * [ECIapollo](/lib/oxidized/model/eciapollo.rb)
 * EdgeCore
-  * [ES3528M](/lib/oxidized/model/edgecos.rb)
+  * [ECS3510, ES3528M](/lib/oxidized/model/edgecos.rb)
+  * [ECS3510, ES3526XA-V2, ES3528M](/lib/oxidized/model/edgecos.rb)
+* Eltex
+  * [Eltex](/lib/oxidized/model/eltex.rb)
 * Ericsson/Redback
   * [IPOS (former SEOS)](/lib/oxidized/model/ipos.rb)
 * Extreme Networks
-  * [Enterasys](/lib/oxidized/model/enterasys.rb)
+  * [Enterasys B/C-Series](/lib/oxidized/model/enterasys.rb)
+  * [Enterasys 800-Series](/lib/oxidized/model/enterasys800.rb)
   * [WM](/lib/oxidized/model/mtrlrfs.rb)
   * [XOS](/lib/oxidized/model/xos.rb)
   * [ExtremeWare](/lib/oxidized/model/xos.rb)
@@ -109,6 +127,7 @@
 * Fiberstore
   * [S3800](/lib/oxidized/model/gcombnps.rb)
   * [S3900](/lib/oxidized/model/edgecos.rb)
+  * [S3900-R](/lib/oxidized/model/bdcom.rb)
   * [S5800](/lib/oxidized/model/cnos.rb)
   * [S5850](/lib/oxidized/model/cnos.rb)
 * Firebrick
@@ -118,6 +137,8 @@
   * [FTOS](/lib/oxidized/model/ftos.rb)
 * FortiGate
   * [FortiOS](/lib/oxidized/model/fortios.rb)
+* FortiWLC
+  * [FortiWLC](/lib/oxidized/model/fortiwlc.rb)
 * Fujitsu
   * [PRIMERGY Blade switch 1/10Gbe](/lib/oxidized/model/fujitsupy.rb)
 * GCOM Technologies
@@ -129,13 +150,16 @@
 * Hillstone Networks
   * [StoneOS](/lib/oxidized/model/stoneos.rb)
 * Hirschmann
-  * [HiOS](/lib/oxidized/model/hirschmann.rb)
+  * [Classic](/lib/oxidized/model/hirschmann.rb)
+  * [HiOS](/lib/oxidized/model/hios.rb)
 * HP
   * [Comware (HP A-series, H3C, 3Com)](/lib/oxidized/model/comware.rb)
   * [Procurve](/lib/oxidized/model/procurve.rb)
   * [BladeSystem (Onboard Administrator)](/lib/oxidized/model/hpebladesystem.rb)
   * [MSA](/lib/oxidized/model/hpemsa.rb)
   * [MSM (Wireless Controller)](/lib/oxidized/model/hpmsm.rb)
+* H3C
+  * [S6520X](/lib/oxidized/model/h3c.rb)
 * Huawei
   * [VRP](/lib/oxidized/model/vrp.rb)
   * [SmartAX series](/lib/oxidized/model/smartax.rb)
@@ -144,6 +168,12 @@
 * Juniper
   * [JunOS](/lib/oxidized/model/junos.rb)
   * [ScreenOS (Netscreen)](/lib/oxidized/model/screenos.rb)
+* LANCOM Systems GmbH
+  * [LCOS](/lib/oxidized/model/lancom.rb)
+* Lenovo
+  * [Lenovo Network OS](/lib/oxidized/model/lenovonos.rb)
+* Linkys
+  * [SRW](/lib/oxidized/model/linksyssrw.rb)
 * Linuxgeneric
   * [CentOS](/lib/oxidized/model/linuxgeneric.rb)
 * Mellanox
@@ -151,11 +181,14 @@
   * [Voltaire](/lib/oxidized/model/voltaire.rb)
 * Mikrotik
   * [RouterOS](/lib/oxidized/model/routeros.rb)
+  * [SwOS and SwOS Lite](/lib/oxidized/model/swos.rb)
 * Motorola
   * [RFS](/lib/oxidized/model/mtrlrfs.rb)
 * MRV
   * [MasterOS](/lib/oxidized/model/masteros.rb)
   * [FiberDriver](/lib/oxidized/model/fiberdriver.rb)
+* NEC
+  * [NEC IX](/lib/oxidized/model/necix.rb)
 * Netgear
   * [Netgear switches](/lib/oxidized/model/netgear.rb)
 * Netonix
@@ -171,7 +204,8 @@
 * [OpenWRT](/lib/oxidized/model/openwrt.rb)
 * [OPNsense](/lib/oxidized/model/opnsense.rb)
 * Palo Alto
-  * [PANOS](/lib/oxidized/model/panos.rb)
+  * [PanOS API](/lib/oxidized/model/panos_api.rb)
+  * [PanOS](/lib/oxidized/model/panos.rb)
 * [PLANET SG/SGS Switches](/lib/oxidized/model/planet.rb)
 * [pfSense](/lib/oxidized/model/pfsense.rb)
 * Pure Storage
@@ -186,8 +220,10 @@
   * [Quanta / VxWorks 6.6 (1.1.0.8)](/lib/oxidized/model/quantaos.rb)
 * Siklu
   * [EtherHaul](/lib/oxidized/model/siklu.rb)
+* Seiko Solutions
+  * [SmartCS, SmartCS mini](/lib/oxidized/model/smartcs.rb)
 * SonicWALL
-  * [SonicOS](lib/oxidized/model/sonicos.rb)
+  * [SonicOS](/lib/oxidized/model/sonicos.rb)
 * SNR
   * [SNR-S300G, S2xxx, S3xxx, S4xxx](/lib/oxidized/model/dcnos.rb)
 * Speedtouch
@@ -203,6 +239,8 @@
   * [Telco Systems T-Marc 3306](/lib/oxidized/model/telco.rb)
 * Trango Systems
   * [Trango](/lib/oxidized/model/trango.rb)
+* TrueNAS
+  * [TrueNAS](/lib/oxidized/model/truenas.rb)
 * TPLink
   * [TPLink](/lib/oxidized/model/tplink.rb)
   * [TL-SL5428](/lib/oxidized/model/edgecos.rb)
@@ -219,9 +257,16 @@
   * [Fireware OS](/lib/oxidized/model/firewareos.rb)
 * Westell
   * [Westell 8178G, Westell 8266G](/lib/oxidized/model/weos.rb)
+* YAMAHA
+  * [YAMAHA NVR/RTX Series](/lib/oxidized/model/yamaha.rb)
 * Zhone
   * [Zhone (OLT and MX)](/lib/oxidized/model/zhoneolt.rb)
+* ZPE
+  * [Nodegrid OS](/lib/oxidized/model/nodegrid.rb)
+* ZTE
+  * [C300&C320 OLT](/lib/oxidized/model/zteolt.rb)
 * Zyxel
   * [ZyNOS](/lib/oxidized/model/zynos.rb)
   * [ZyNOS GS-series variant](/lib/oxidized/model/zynosgs.rb)
   * [NDMS](/lib/oxidized/model/ndms.rb)
+  * [1308](/lib/oxidized/model/zy1308.rb)

data/docs/Troubleshooting.md

@@ -53,7 +53,7 @@ irb(main):003:0> '$EKRET-5A-X20#'.match /^([\$\w.@()-]+[#>]\s?)$/
 => #<MatchData "$EKRET-5A-X20#" 1:"$EKRET-5A-X20#">
 ```
 
-The new prompt now matches. You can copy the current model into the `~/.config/oxidized/` directory (keeping the original file name), and modify the prompt within the model file. After restarting Oxidized, the adapted model will be used.
+The new prompt now matches. You can copy the current model into the `~/.config/oxidized/model/` directory (keeping the original file name), and modify the prompt within the model file. After restarting Oxidized, the adapted model will be used.
 
 *Troubleshooting an overly greedy prompt:*
 

data/extra/gitdiff-msteams.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+# Posts a git diff to MS Team Channel using webhooks
+#
+# Usage:
+#   Make sure jq and curl are installed.
+#   Save this script in /var/lib/oxidized/extra/
+#   Add to oxidized config:
+#
+# hooks:
+#  ms_teams_webhook:
+#    type: exec
+#    events: [post_store]
+#    cmd: '/var/lib/oxidized/extra/gitdiff-msteams.sh'
+#    async: true
+#    timeout: 120
+#
+# Add webhook to your MS Teams channel and set the next variable to the full url
+
+weburl="https://contoso.webhook.office.com/webhookb2/etc etc etc"
+
+postdata()
+{
+    COMMIT=$(git --bare --git-dir="${OX_REPO_NAME}" show --pretty='' --no-color "${OX_REPO_COMMITREF}" | jq --raw-input --slurp --compact-output)
+    cat <<EOF
+{
+   "type":"message",
+   "attachments":[
+      {
+         "contentType":"application/vnd.microsoft.card.adaptive",
+         "contentUrl":null,
+         "content":{
+            "$schema":"http://adaptivecards.io/schemas/adaptive-card.json",
+            "type":"AdaptiveCard",
+            "version":"1.2",
+            "msTeams": { "width": "full" },
+            "body":[
+                {
+                    "type": "TextBlock",
+                    "text": "Oxidized update for ${OX_NODE_NAME}",
+                    "size": "medium",
+                    "weight": "Bolder",
+                    "style": "heading",
+                    "wrap": "true"
+                },
+                {
+                    "type": "FactSet",
+                    "facts": [
+                        {
+                            "title": "Node name",
+                            "value": "${OX_NODE_NAME}"
+                        },
+                        {
+                            "title": "Job status",
+                            "value": "${OX_JOB_STATUS}"
+                        },
+                        {
+                            "title": "Job time",
+                            "value": "${OX_JOB_TIME}"
+                        },
+                        {
+                            "title": "Git repo",
+                            "value": "${OX_REPO_NAME}"
+                        },
+                        {
+                            "title": "Git commit ID",
+                            "value": "${OX_REPO_COMMITREF}"
+                        }
+                    ]
+                },
+                {
+                    "type": "RichTextBlock",
+                    "inlines": [
+                        {
+                            "type": "TextRun",
+                            "text": ${COMMIT},
+                            "fontType": "monospace",
+                            "size": "small"
+                        }
+                    ]
+                }
+           ]
+         }
+      }
+   ]
+}
+EOF
+}
+
+curl -i \
+-H "Content-Type: application/json" \
+-X POST --data "$(postdata)" "${weburl}"

data/extra/nagios_check_failing_nodes.rb

@@ -12,17 +12,14 @@ pending_nodes = []
 
 json = JSON.parse(open("http://localhost:8888/nodes.json").read)
 json.each do |node|
-  unless ARGV.empty?
-    next if ARGV[0] != node['name']
-  end
-  if not node['last'].nil?
-    if node['last']['status'] != 'success'
-      critical_nodes << node['name']
-      critical = true
-    end
-  else
+  next if !ARGV.empty? && (ARGV[0] != node['name'])
+
+  if node['last'].nil?
     pending_nodes << node['name']
     pending = true
+  elsif node['last']['status'] != 'success'
+    critical_nodes << node['name']
+    critical = true
   end
 end
 

data/extra/oxidized-report-git-commits

@@ -21,41 +21,98 @@
 #            Removed requirement for Git working directory
 #            Check job status
 #
+# 20200926 - Nick Hilliard <nick@foobar.org>
+#            sends email
+#            add command-line options to stop blank emails from being sent
+#            more sanity-checking
 #
 # usage: add the following hook to the oxidized config file:
 # 
+# --
 # hooks:
 #  email_output:
 #    type: exec
 #    events: [post_store, node_fail]
-#    cmd: '/home/oxidized/extra/oxidized-report-git-commits | mail -s "Oxidized updates for ${OX_NODE_NAME}" update-recipient@example.com'
+#    cmd: '/home/oxidized/extra/oxidized-report-git-commits -s "Oxidized updates for ${OX_NODE_NAME}" -r update-recipient@example.com'
 #    async: true
 #    timeout: 120
-# 
+# --
 #
+# Options:
+#         -r email_recipient    - send email to specified recipient
+#         -s email_subject      - specify the email subject line
+#         -f                    - don't send email if git fails to find commit
+# 
+
+trap '/bin/rm -f "$tmpfile"' EXIT
+
+tmpfile=$(mktemp) || exit 1
+
+subject="Oxidized updates for ${OX_NODE_NAME}"
+scriptname=`basename $0`
+
+usage()
+{
+    echo "Usage: ${scriptname} [-f] [ -s email_subject ] [ -r email_recipient ]"
+    exit 1
+}
+
+email_on_gitfail=1
+while getopts "fs:r:" opt; do
+    case $opt in
+        s) 
+            subject=$OPTARG
+            ;;
+        r)
+            recipient=$OPTARG
+            ;;
+        f)
+            email_on_gitfail=0
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
 
-echo "Node name: ${OX_NODE_NAME}"
-echo "Group name: ${OX_NODE_GROUP}"
-echo "Job status: ${OX_JOB_STATUS}"
-echo "Job time: ${OX_JOB_TIME}"
 
 if [ "${OX_EVENT}" = "node_fail" ]; then
-    echo 'Job failed'
+    echo "${scriptname}: ${OX_NODE_NAME}": 'Job failed'
     exit 64
 fi
 
 if [ -z "${OX_REPO_COMMITREF}" ]; then
-	echo '$OX_REPO_COMMITREF not set'
+	echo "${scriptname}: "'$OX_REPO_COMMITREF not set'
 	exit 64
 fi
 
 if [ -z "${OX_REPO_NAME}" ]; then
-	echo '$OX_REPO_NAME not set'
+	echo "${scriptname}: "'$OX_REPO_NAME not set'
 	exit 64
 fi
-	
-echo "Git repo: ${OX_REPO_NAME}"
-echo "Git commit ID: ${OX_REPO_COMMITREF}"
-echo ""
 
-git --bare --git-dir="${OX_REPO_NAME}" show --pretty='' --no-color "${OX_REPO_COMMITREF}"
+cat > ${tmpfile} <<EOF
+Node name: ${OX_NODE_NAME}
+Group name: ${OX_NODE_GROUP}
+Job status: ${OX_JOB_STATUS}
+Job time: ${OX_JOB_TIME}
+Git repo: ${OX_REPO_NAME}
+Git commit ID: ${OX_REPO_COMMITREF}
+
+EOF
+
+# test if commit exists
+git --bare --git-dir="${OX_REPO_NAME}" rev-parse --quiet --verify "${OX_REPO_COMMITREF}" > /dev/null 2>&1
+gitret=$?
+
+if [ ${gitret} -eq 0 ]; then
+    git --bare --git-dir="${OX_REPO_NAME}" show --pretty='' --no-color "${OX_REPO_COMMITREF}" >> ${tmpfile} 2>&1
+else
+    echo "${scriptname}: commit ${OX_REPO_COMMITREF} does not exist" >> ${tmpfile}
+fi
+
+if [ ! -z "${recipient}" -a \( ${gitret} -eq 0 -o ${email_on_gitfail} -eq 1 \) ]; then
+    cat ${tmpfile} | mail -s "${subject}" "${recipient}"
+else
+    cat ${tmpfile}
+fi

data/extra/oxidized.init

@@ -18,7 +18,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 DAEMON=$(which oxidized)
 NAME="oxidized"
 DESC="Oxidized - Network Device Configuration Backup Tool"
-ARGS=""
 USER="oxidized"
 
 test -x $DAEMON || exit 0
@@ -29,20 +28,18 @@ if [ -r /etc/default/$NAME ]; then
 	. /etc/default/$NAME
 fi
 
-CONFIG="${CONFIG:-/etc/oxidized/config}"
-
 PIDFILE=/var/run/$NAME.pid
 
 do_start()
 {
         start-stop-daemon --start --quiet --background --pidfile $PIDFILE --make-pidfile  \
-        --oknodo --chuid $USER --exec $DAEMON -- -c $CONFIG $ARGS
+        --oknodo --chuid $USER --exec $DAEMON
 }
 
 do_stop()
 {
         start-stop-daemon --oknodo --stop --quiet -v --pidfile $PIDFILE \
-        --chuid $USER --retry KILL/10 -- -c $CONFIG $ARGS
+        --chuid $USER --retry KILL/10
 }
 
 case "$1" in

data/extra/oxidized.logrotate

@@ -4,4 +4,5 @@
     size 10M
     compress
     delaycompress
+    missingok
 }

data/extra/oxidized.runit

@@ -1,2 +1,5 @@
 #!/bin/bash
-exec setuser root oxidized
+[ ! -d /home/oxidized/.config/oxidized ] && mkdir -p /home/oxidized/.config/oxidized
+[ -f /home/oxidized/.config/oxidized/pid ] && rm /home/oxidized/.config/oxidized/pid
+chown -R oxidized:oxidized /home/oxidized/.config/oxidized
+exec setuser oxidized oxidized

data/extra/oxidized.service

@@ -1,12 +1,9 @@
-#For debian 8 put it in /lib/systemd/system/
-#To set OXIDIZED_HOME instead of the default:
-# ~${oxidized_user}/.config/oxidized in debian 8, then uncomment
-#(and modify as required) the "Environment" variable below so
-#systemd sets the correct environment. Tested only on Debian 8.8.
-#YMMV otherwise.
+# Put this file in /etc/systemd/system.
 #
-#For RHEL / CentOS 7 put it in /etc/systemd/system/
-#and call it with systemctl start oxidized.service
+# To set OXIDIZED_HOME instead of the default,
+# ~oxidized/.config/oxidized, uncomment (and modify as required) the
+# "Environment" variable below so systemd sets the correct
+# environment.
 
 [Unit]
 Description=Oxidized - Network Device Configuration Backup Tool

data/extra/rest_client.rb

@@ -6,7 +6,7 @@ module Oxidized
     require 'asetus'
 
     class Config
-      Root = Root = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized')
+      Root = Root = ENV['OXIDIZED_HOME'] || File.join(Dir.home, '.config', 'oxidized')
     end
 
     CFGS = Asetus.new name: 'oxidized', load: false, key_to_s: true

data/extra/syslog.rb

@@ -29,7 +29,7 @@ require_relative 'rest_client'
 module Oxidized
   require 'asetus'
   class Config
-    Root = File.join ENV['HOME'], '.config', 'oxidized'
+    Root = File.join Dir.home, '.config', 'oxidized'
   end
 
   CFGS = Asetus.new name: 'oxidized', load: false, key_to_s: true
@@ -105,7 +105,7 @@ module Oxidized
     end
 
     def handle_log(log, ipaddr)
-      log = log.to_s.split ' '
+      log = log.to_s.split
       index, vendor = MSG.find do |key, value|
         index = log.find_index { |e| e.match value }
         break index, key if index

data/lib/oxidized/cli.rb

@@ -72,7 +72,7 @@ module Oxidized
 
       begin
         File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY) { |f| f.write(Process.pid.to_s) }
-        at_exit { File.delete(pidfile) if File.exist?(pidfile) }
+        at_exit { FileUtils.rm_f(pidfile) }
       rescue Errno::EEXIST
         check_pid
         retry

data/lib/oxidized/config/vars.rb

@@ -1,12 +1,15 @@
 module Oxidized::Config::Vars
   # convenience method for accessing node, group or global level user variables
   def vars(name)
+    model_name = @node.model.class.name.to_s.downcase
     if @node.vars&.has_key?(name)
       @node.vars[name]
+    elsif Oxidized.config.groups.has_key?(@node.group) && Oxidized.config.groups[@node.group].models.has_key(model_name) && Oxidized.config.groups[@node.group].models[model_name].vars.has_key?(name.to_s)
+      Oxidized.config.groups[@node.group].models[model_name].vars[name.to_s]
     elsif Oxidized.config.groups.has_key?(@node.group) && Oxidized.config.groups[@node.group].vars.has_key?(name.to_s)
       Oxidized.config.groups[@node.group].vars[name.to_s]
-    elsif Oxidized.config.models.has_key(@node.model.class.name.to_s.downcase) && Oxidized.config.models[@node.model.class.name.to_s.downcase].vars.has_key?(name.to_s)
-      Oxidized.config.models[@node.model.class.name.to_s.downcase].vars[name.to_s]
+    elsif Oxidized.config.models.has_key(model_name) && Oxidized.config.models[model_name].vars.has_key?(name.to_s)
+      Oxidized.config.models[model_name].vars[name.to_s]
     elsif Oxidized.config.vars.has_key?(name.to_s)
       Oxidized.config.vars[name.to_s]
     end

data/lib/oxidized/config.rb

@@ -2,8 +2,9 @@ module Oxidized
   require 'asetus'
   class NoConfig < OxidizedError; end
   class InvalidConfig < OxidizedError; end
+
   class Config
-    Root      = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized')
+    Root      = ENV['OXIDIZED_HOME'] || File.join(Dir.home, '.config', 'oxidized')
     Crash     = File.join(ENV['OXIDIZED_LOGS'] || Root, 'crash')
     Log       = File.join(ENV['OXIDIZED_LOGS'] || Root, 'logs')
     InputDir  = File.join Directory, %w[lib oxidized input]
@@ -14,7 +15,7 @@ module Oxidized
     Sleep     = 1
 
     def self.load(cmd_opts = {})
-      asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true)
+      asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true, usrdir: Oxidized::Config::Root)
       Oxidized.asetus = asetus
 
       asetus.default.username      = 'username'
@@ -25,6 +26,7 @@ module Oxidized
       asetus.default.use_syslog    = false
       asetus.default.debug         = false
       asetus.default.threads       = 30
+      asetus.default.use_max_threads = false
       asetus.default.timeout       = 20
       asetus.default.retries       = 3
       asetus.default.prompt        = /^([\w.@-]+[#>]\s?)$/
@@ -32,6 +34,7 @@ module Oxidized
       asetus.default.next_adds_job = false            # if true, /next adds job, so device is fetched immmeiately
       asetus.default.vars          = {}               # could be 'enable'=>'enablePW'
       asetus.default.groups        = {}               # group level configuration
+      asetus.default.group_map     = {}               # map aliases of groups to names
       asetus.default.models        = {}               # model level configuration
       asetus.default.pid           = File.join(Oxidized::Config::Root, 'pid')
 
@@ -69,6 +72,6 @@ module Oxidized
   end
 
   class << self
-    attr_accessor :mgr, :Hooks
+    attr_accessor :mgr, :hooks
   end
 end

data/lib/oxidized/core.rb

@@ -10,7 +10,7 @@ module Oxidized
 
     def initialize(_args)
       Oxidized.mgr = Manager.new
-      Oxidized.Hooks = HookManager.from_config(Oxidized.config)
+      Oxidized.hooks = HookManager.from_config(Oxidized.config)
       nodes = Nodes.new
       raise NoNodesFound, 'source returns no usable nodes' if nodes.size.zero?
 

data/lib/oxidized/hook/exec.rb

@@ -30,11 +30,9 @@ class Exec < Oxidized::Hook
     env = make_env ctx
     log "Execute: #{@cmd.inspect}", :debug
     th = Thread.new do
-      begin
-        run_cmd! env
-      rescue StandardError => e
-        raise e unless @async
-      end
+      run_cmd! env
+    rescue StandardError => e
+      raise e unless @async
     end
     th.join unless @async
   end
@@ -70,7 +68,9 @@ class Exec < Oxidized::Hook
         "OX_NODE_GROUP"     => ctx.node.group.to_s,
         "OX_NODE_MODEL"     => ctx.node.model.class.name,
         "OX_REPO_COMMITREF" => ctx.commitref.to_s,
-        "OX_REPO_NAME"      => ctx.node.repo.to_s
+        "OX_REPO_NAME"      => ctx.node.repo.to_s,
+        "OX_ERR_TYPE"       => ctx.node.err_type.to_s,
+        "OX_ERR_REASON"     => ctx.node.err_reason.to_s
       )
     end
     if ctx.job