Merge branch 'branches/rudder/6.2' into branches/rudder/7.2

ansible-policies/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 PLUGIN_FULL_NAME="rudder-plugin-ansible-policies"
 PRETTY_NAME="Ansible Policies"
 CONFIGURATION_PATH=/var/rudder/packages/$PLUGIN_FULL_NAME

ansible-policies/packaging/prerm

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 PLUGIN_FOLDER="/var/rudder/packages/rudder-plugin-ansible-policies"
 
 # Remove techniques

api-authorizations/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 # create table for Rudder data sources plugin:
 # note that if you installed Rudder 4.1~alpha or 4.1~beta1, or a previous version
 # of the plugin, you can skip that step (which would fail with a "table exists" error)

auth-backends/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 # add post-installation script, like:
 
 # psql -U rudder -h localhost -d rudder -f /opt/rudder/share/plugins/authbackends/AuthBackends-schema.sql

branding/packaging/postinst

@@ -1,3 +1,3 @@
 #!/bin/bash
-set -xe
+set -e
 

change-validation/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 SQL_CREDENTIALS=$(grep -c -E "^rudder.jdbc.(username|password)[ \t]*=" /opt/rudder/etc/rudder-web.properties || true)
 
 if [ -f /opt/rudder/etc/rudder-web.properties -a ${SQL_CREDENTIALS} -eq 2 ]; then

cis/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 CONFIG_REPO=/var/rudder/configuration-repository
 CATEGORY="{category}"
 C_CATEGORY=$(echo $CATEGORY | sed "s/[^a-zA-Z0-9_]/_/g")

cis/packaging/prerm

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 NAME="{plugin-id}"
 PLUGIN_FOLDER="/var/rudder/packages/rudder-plugin-${NAME}"
 

datasources/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 # Postinstall for Rudder datasource plugin
 RUDDER_OPT="/opt/rudder"
 

glpi/bin/glpi-plugin

@@ -27,9 +27,9 @@ case "${ACTION}" in
   ;;
 
   send-one)
+    INV=$(ls -1 "${INVENTORIES_DIR}" | egrep "$2.*\.ocs$")
     echo "[ ] Sending inventory ${INVENTORIES_DIR}/${INV} to GLPI..."
 #shellcheck disable=SC2012
-    INV=$(ls -1 "${INVENTORIES_DIR}" | egrep "$2.*\.ocs$")
     FIC="${INVENTORIES_DIR}"/"${INV}"
     [ ! -r "${FIC}" ] && echo "No file candidate for $2" && exit 1
     send_inventory "${INVENTORIES_DIR}"/"${INV}"

glpi/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 CONFFILE="/opt/rudder/etc/glpi.conf"
 
 echo "15 7 * * * /opt/rudder/bin/glpi-plugin send-all" > /etc/cron.d/glpi-rudder

helloworld/packaging/postinst

@@ -1,2 +1,2 @@
 #!/bin/bash
-set -xe
+set -e

node-external-reports/packaging/postinst

@@ -1,3 +1,3 @@
 #!/bin/bash
-set -xe
+set -e
 

notify/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 
 CONFFILE="/opt/rudder/etc/notify.conf"
 

openscap/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 PLUGIN_NAME="openscap"
 PRETTY_NAME="OpenSCAP Policies"
 CONFIGURATION_PATH=/opt/rudder/share/plugins/$PLUGIN_NAME

openscap/packaging/prerm

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 PLUGIN_FOLDER="/var/rudder/packages/rudder-plugin-openscap"
 
 # Remove techniques

qa-test

@@ -46,15 +46,15 @@ test_typos()
 
 test_scripts()
 {
-  # plugin packaging scripts (postinst, etc...) must have the set -xe enabled
+  # plugin packaging scripts (postinst, etc...) must have the set -e enabled
   RESULT=0
   find . -name "packaging" -type d -not -path "./src/*"|
     while IFS="" read -r directory
     do
       for file in $directory/*; do
         if sed -n '1p' $file | grep -q "#\!/bin/bash"; then
-          if ! grep -q "set -xe" "$file"; then
-            echo "$file does not seem to contain mandatory 'set -xe' line"
+          if ! grep -q "set -e" "$file"; then
+            echo "$file does not seem to contain mandatory 'set -e' line"
             RESULT=1
           fi
         fi

scale-out-relay/packaging/postinst

@@ -1,8 +1,3 @@
 #!/bin/bash
 set -e
 
-# Force policy regeneration at restart
-touch /opt/rudder/etc/trigger-policy-generation
-cp /opt/rudder/share/plugins/scale-out-relay/server-node-to-relay /opt/rudder/share/commands/
-cp /opt/rudder/share/plugins/scale-out-relay/server-relay-to-node /opt/rudder/share/commands/
-echo "Plugin scale-out-relay successfully installed"

user-management/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 
 # add post-installation script, like:
 

zabbix/packaging/postinst

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xe
+set -e
 
 CONFFILE="/opt/rudder/etc/zabbix.conf"