Merge remote-tracking branch 'origin/integration' into xmppmaster

Changelog

@@ -1,3 +1,70 @@
+pulse-xmpp-agent 2.1.7
+======================
+* [BUGFIX]  Fix detecting IP address of the XMPP server when the agent starts.
+* [BUGFIX]  Fix backtrace in the substitute registration when there is more
+than on location.
+* [BUGFIX]  Fix handling some accounts creation
+
+pulse-xmpp-agent 2.1.6
+======================
+* [FEATURE] Change some infos messages into debug
+* [FEATURE] Document more functions
+* [FEATURE] Convergences are now identified by their name + date
+* [FEATURE] Add more error messages to help to find where are the problems. (
+when we cannot contact a database ).
+* [BUGFIX]  Fix backtrace during deployment
+* [BUGFIX]  Fix detection of online/offline machine in the Glpi view
+* [BUGFIX]  Fix escaping symbols to fix backtraces
+* [BUGFIX]  Fix support of older SQLAlchey
+* [BUGFIX]  Fix registry when there is no uuidsetup defined
+* [BUGFIX]  Grant Rights for Admin on the ARS Cluster.
+* [BUGFIX]  Only show setupuuid info message if showinfobool is enable
+* [BUGFIX]  Fix a backtrace when we have a machine with an inventory but no uuid_serial_machine.
+* [BUGFIX]  Fix glpi 9.2 support (add back missing functions)
+* [BUGFIX]  Fix support of accentuated letters glpi <-> pulse
+* [BUGFIX]  Fix glpi 9.5 support
+* [BUGFIX]  Initialise listmodulemmc before use
+* [BUGFIX]  Fix registering ARS
+* [BUGFIX]  Uninstall python and reinstall it if we failed the python pip step
+* [BUGFIX]  Change cluster_resources sql column size to 255
+
+pulse-xmpp-agent 2.1.5
+======================
+* [FEATURE] Add the support of OCS
+* [BUGFIX] Add robustness for pulseuser profile checking
+
+pulse-xmpp-agent 2.1.4
+======================
+* [FEATURE] Add of a parameter to force configuration in case of network change
+* [BUGFIX] Fix replicator.py for relay automatic updates
+* [BUGFIX] Fix a segfault in guacamoleconf
+
+pulse-xmpp-agent 2.1.3
+======================
+* [FEATURE]  Add plugin to install fileviewer
+* [FEATURE]  Add Glpi 9.5 support
+* [FEATURE]  Add Openssh update plugin
+* [FEATURE]  Add Syncthing update plugin
+* [FEATURE]  Add FusionInventory update plugin
+* [FEATURE]  Add Pulse Network Notify update plugin
+* [FEATURE]  Add Tighvnc update plugin
+* [FEATURE]  Clean installer to install only pulse + python  (and deps)
+* [FEATURE]  Fix creation of reverse ssh tunnel
+* [FEATURE]  Add monitoring support
+* [FEATURE]  Add updateuseraccount plugin to create windows pulseuser account
+* [FEATURE]  Fix restarting Agentxmpp if a processus die
+* [FEATURE]  Add log compression support on windows
+* [FEATURE]  Fix finding hostname where domain is written in the /etc/hostname file
+* [BUGFIX] Fix systemd support
+* [BUGFIX] Change pulseuser home folder from /var/lib/pulse2 to /home/pulseuser
+* [BUGFIX] Fix syncthing support
+* [BUGFIX] Fix debugs to be more understandable
+* [BUGFIX] Fix GLPI 0.84 support
+
+pulse-xmpp-agent 2.1.2
+======================
+* [FEATURE]  Use FusionInventory 2.5.2
+
 pulse-xmpp-agent 2.1.1
 ======================
 * [FEATURE]  Agents now use ifconfig.co webservice to find location

Changelog_fr

@@ -0,0 +1,30 @@
+pulse-xmpp-agent 2.1.7
+======================
+* [CORRECTION DE BUG]  Correction de la détection de l'adresse IP du serveur
+XMPP lorsque l'agent démarre.
+* [CORRECTION DE BUG]  Correction d'un plantage lorsqu'il y a des 'locations'
+en double
+
+pulse-xmpp-agent 2.1.6
+======================
+* [FONCTIONNALITE]     Changement de quelques DEBUG en INFO
+* [FONCTIONNALITE]     Ajout de documentation de fonctions
+* [FONCTIONNALITE]     Les convergences sont maintenant identifiées par leur
+nom + date
+* [FONCTIONNALITE]     Ajout de plus de messages d'erreur afin d'aider a
+identifier l'origine de soucis ( soucis de connexion aux bases par exemple ).
+* [CORRECTION DE BUG]  Correction de backtrace pendant le déploiement
+* [CORRECTION DE BUG]  Correction de la detection de machines en ligne/hors
+ligne
+* [CORRECTION DE BUG]  Ajout du support de versions plus anciennes de
+SQLAlchemy
+* [CORRECTION DE BUG]  Correction de l'enregistrement lorsque le uuidsetup n'est pas
+défini
+* [CORRECTION DE BUG]  Correction de l'affichage de des messages d'information
+uniquement lors que setupuuid est actif
+* [CORRECTION DE BUG]  Correction d'un backtrace lorsqu'une machine a un
+inventaire mais aucun uuid_serial_machine d'affecté
+* [CORRECTION DE BUG]  Correction du support de glpi 9.2
+* [CORRECTION DE BUG]  Correction du support de glpi 9.5
+* [CORRECTION DE BUG]  Désinstallation/réinstallation de python si l'étape pip
+echoue.

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Pulse Xmpp Agent"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.1.1
+PROJECT_NUMBER         = 2.1.7
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

contrib/scripts/pulse-xmpp-agent-relay.logrotate

@@ -1,8 +1,10 @@
-/var/log/pulse/xmpp-agent.log /var/log/pulse/xmpp-agent-log.log /var/log/pulse/pulse-package-watching.log
+/var/log/pulse/xmpp-agent-machine.log /var/log/pulse/xmpp-agent-relay.log /var/log/pulse/xmpp-agent-log.log /var/log/pulse/pulse-package-watching.log
 {
     missingok
     daily
     copytruncate
     rotate 7
     create 0644 root root
+    compress
+    delaycompress
 }

debian/changelog

@@ -1,3 +1,15 @@
+pulse-xmpp-agent (2.1.5-1) unstable; urgency=low
+
+ * New version 2.1.5
+
+ -- Nicolas Lécureuil <[email protected]>  Mon, 31 Mar 2021 10:48:04 +0200
+
+pulse-xmpp-agent (2.1.4-1) unstable; urgency=low
+
+ * New version 2.1.4
+
+ -- Nicolas Lécureuil <[email protected]>  Fri, 19 Mar 2021 10:48:04 +0200
+
 pulse-xmpp-agent (2.0.8-1) unstable; urgency=low
 
  * New version 2.0.8

debian/control

@@ -7,7 +7,7 @@ Uploaders: Nicolas Lécureuil <[email protected]>
 Build-Depends: debhelper (>= 9),
                dh-python,
                python-all-dev (>= 2.6.6-3~),
-	       python-setuptools, git
+	       python-setuptools, git, sudo 
 Standards-Version: 3.9.8
 Homepage: http://cyberelk.net/tim/software/pycups/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-cups.git
@@ -17,14 +17,14 @@ X-Python-Version: >= 2.7
 Package: pulse-xmpp-agent-relay
 Architecture: all
 Provides: ${python:Provides}
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-sleekxmpp, python-netifaces, python-configparser, python-zipfile2, python-pycurl, python-mysqldb-dbg, python-croniter, python-psutil, python-crypto, python-lxml, python-requests, python-sftp, python-pyinotify, python-wakeonlan
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-sleekxmpp, python-netifaces, python-configparser, python-zipfile2, python-pycurl, python-mysqldb-dbg, python-croniter, python-psutil, python-crypto, python-lxml, python-requests, python-sftp, python-pyinotify, python-wakeonlan, python-cherrypy3, net-tools, jq
 Description: Pulse xmpp agent
 Breaks: pulse-agent-installers  (<< 1.9.1), pulseagent-plugins-relay (<< 2.0.5), pulse-xmpp-agent (<< 2.0.5)
 Replaces: pulse-agent-installers (<< 1.9.1), pulseagent-plugins-relay , pulse-xmpp-agent
 
 Package: pulse-xmpp-master-substitute
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, jq
 Description: Pulse master agent substitute
 
 Package: pulse-xmppmaster-agentplugins
@@ -35,7 +35,8 @@ Description: plugins for pulse xmppmaster
 
 Package: pulse-agent-installers
 Architecture: all
-Depends: ${misc:Depends}, pulse-xmpp-agent-deps (>= 1.8), dos2unix, unzip, zip, nsis-plugins-accesscontrol, nsis-plugins-inetc, nsis-plugins-pwgen, nsis-plugins-zipdll, uuid, nsis-plugins-textreplace, xar, pulse-kiosk-agent-deps, xz-utils, dpkg-dev, debhelper (>= 9), python-all-dev (>= 2.6.6-3~), build-essential, createrepo, crudini
+Pre-Depends: pulse-filetree-generator
+Depends: ${misc:Depends}, pulse-xmpp-agent-deps (>= 1.8), dos2unix, unzip, zip, nsis-plugins-accesscontrol, nsis-plugins-inetc, nsis-plugins-pwgen, nsis-plugins-zipdll, uuid, nsis-plugins-textreplace, pulse-kiosk-agent-deps, xz-utils, dpkg-dev, debhelper (>= 9), python-all-dev (>= 2.6.6-3~), build-essential, createrepo, crudini
 Description: Pulse 2 Xmpp agent installer
 Breaks: pulse-xmppmaster-agentplugins (<< 2.0.7)
 Replaces: pulse-xmppmaster-agentplugins

debian/pulse-agent-installers.conffiles

@@ -1,3 +1,7 @@
 /var/lib/pulse2/clients/config/agentconf.ini
-/var/lib/pulse2/clients/config/manage_scheduler.ini
+/var/lib/pulse2/clients/config/manage_scheduler_machine.ini
 /var/lib/pulse2/clients/config/inventory.ini
+/var/lib/pulse2/clients/config/start.ini
+/var/lib/pulse2/clients/config/startupdate.ini
+/var/lib/pulse2/clients/config/updateopenssh.ini
+/var/lib/pulse2/clients/config/updatetightvnc.ini

debian/pulse-agent-installers.install

@@ -1,11 +1,12 @@
 var/lib/pulse2/clients/config/agentconf.ini
-var/lib/pulse2/clients/config/manage_scheduler.ini
+var/lib/pulse2/clients/config/manage_scheduler_machine.ini
 var/lib/pulse2/clients/config/inventory.ini
-var/lib/pulse2/clients/generate-agent-deps-package
+var/lib/pulse2/clients/config/start.ini
+var/lib/pulse2/clients/config/startupdate.ini
+/var/lib/pulse2/clients/config/updatetightvnc.ini
+/var/lib/pulse2/clients/config/updateopenssh.ini
 var/lib/pulse2/clients/generate-agent-package
-var/lib/pulse2/clients/generate-netcheck-package
 var/lib/pulse2/clients/generate-pulse-agent.sh
-var/lib/pulse2/clients/generate-service-package
 var/lib/pulse2/clients/lin/deb/pulse-agent-linux
 var/lib/pulse2/clients/lin/deb/pulse-agent-linux/debian
 var/lib/pulse2/clients/lin/deb/pulse-agent-linux/debian/changelog
@@ -14,22 +15,17 @@ var/lib/pulse2/clients/lin/deb/pulse-agent-linux/debian/control.in
 var/lib/pulse2/clients/lin/deb/pulse-agent-linux/debian/pulse-agent-linux.install
 var/lib/pulse2/clients/lin/deb/pulse-agent-linux/debian/pulse-agent-linux.postinst.in
 var/lib/pulse2/clients/lin/deb/pulse-agent-linux/debian/rules
-var/lib/pulse2/clients/lin/deb/pulse-agent-linux/usr
-var/lib/pulse2/clients/lin/deb/pulse-agent-linux/usr/sbin
-var/lib/pulse2/clients/lin/deb/pulse-agent-linux/usr/sbin/pulse-filetree-generator
 var/lib/pulse2/clients/lin/generate-pulse-agent-linux.sh
 var/lib/pulse2/clients/lin/install-pulse-agent-linux.sh.in
 var/lib/pulse2/clients/lin/rpm/package/SOURCES/postinst
-var/lib/pulse2/clients/lin/rpm/package/SOURCES/pulse-filetree-generator
 var/lib/pulse2/clients/mac/Info.plist.in
 var/lib/pulse2/clients/mac/generate-pulse-agent-mac.sh
 var/lib/pulse2/clients/mac/net.siveo.pulse_xmpp_agent.plist
 var/lib/pulse2/clients/mac/postflight.in
-var/lib/pulse2/clients/mac/pulse-filetree-generator
 var/lib/pulse2/clients/mac/rbash
 var/lib/pulse2/clients/mac/runpulseagent
-var/lib/pulse2/clients/pulse-xmpp-agent-2.1.1.tar.gz
-var/lib/pulse2/clients/pulse-machine-plugins-2.1.1.tar.gz
+var/lib/pulse2/clients/pulse-xmpp-agent-2.1.7.tar.gz
+var/lib/pulse2/clients/pulse-machine-plugins-2.1.7.tar.gz
 var/lib/pulse2/clients/style.css
 var/lib/pulse2/clients/win/agent-installer.nsi.in
 var/lib/pulse2/clients/win/artwork
@@ -49,7 +45,6 @@ var/lib/pulse2/clients/win/libs/Junction.nsh
 var/lib/pulse2/clients/win/netcheck-service.py
 var/lib/pulse2/clients/win/networkevents.py
 var/lib/pulse2/clients/win/pulse-agent-task.xml
-var/lib/pulse2/clients/win/pulse-filetree-generator.exe
 var/lib/pulse2/clients/win/pulse-service.py
 var/lib/pulse2/clients/win/powershell-policy-remotesigned.pol
 var/lib/pulse2/xmpp_baseremoteagent

debian/pulse-agent-installers.postinst

@@ -13,8 +13,6 @@ cd /var/lib/pulse2/clients
 ./generate-pulse-agent.sh --minimal
 ./generate-agent-package
 
-#cd /var/lib/pulse2/clients/win
-#./generate-kiosk-package
 #DEBHELPER#
 
 exit 0

debian/pulse-xmpp-agent-relay.conffiles

@@ -7,4 +7,4 @@
 /etc/pulse-xmpp-agent/wakeonlan.ini
 /etc/pulse-xmpp-agent/relayconf.ini
 /etc/pulse-xmpp-agent/package_watching.ini
-/etc/pulse-xmpp-agent/manage_scheduler.ini
+/etc/pulse-xmpp-agent/manage_scheduler_relay.ini

debian/pulse-xmpp-agent-relay.install

@@ -9,6 +9,8 @@ usr/lib/python2.*/*-packages/pulse_xmpp_agent/script/create-profile.ps1
 usr/lib/python2.*/*-packages/pulse_xmpp_agent/script/remove-profile.ps1
 usr/lib/python2.*/*-packages/pulse_xmpp_agent/agentversion
 usr/lib/python2.*/*-packages/pulse_xmpp_agent/descriptor_scheduler_relay
+usr/lib/python2.*/*-packages/pulse_xmpp_agent/descriptor_scheduler_machine
+usr/lib/python2.*/*-packages/pulse_xmpp_master_substitute/sessiondeploysubstitute
 var/log/pulse/
 usr/lib/systemd/system/pulse-xmpp-agent-log.service  
 usr/lib/systemd/system/pulse-xmpp-agent-relay.service

debian/pulse-xmpp-master-substitute.install

@@ -4,11 +4,13 @@ usr/lib/python2.*/*-packages/pulse_xmpp_master_substitute/agentversion
 usr/lib/python2.*/*-packages/pulse_xmpp_master_substitute/bin
 usr/lib/python2.*/*-packages/pulse_xmpp_master_substitute/lib
 usr/lib/python2.*/*-packages/pulse_xmpp_master_substitute/pluginsmastersubstitute
+usr/lib/python2.*/*-packages/pulse_xmpp_master_substitute/descriptor_scheduler_substitute
 usr/lib/systemd/system/pulse-xmpp-master-substitute-inventory.service
 usr/lib/systemd/system/pulse-xmpp-master-substitute-registration.service
 usr/lib/systemd/system/pulse-xmpp-master-substitute-assessor.service
 usr/lib/systemd/system/pulse-xmpp-master-substitute-subscription.service
 usr/lib/systemd/system/pulse-xmpp-master-substitute-logger.service
 usr/lib/systemd/system/pulse-xmpp-master-substitute-deployment.service
 usr/lib/systemd/system/pulse-xmpp-master-substitute-reconfigurator.service
+usr/lib/systemd/system/pulse-xmpp-master-substitute-monitoring.service
 etc/pulse-xmpp-agent-substitute/*.ini

debian/pulse-xmpp-master-substitute.postinst

@@ -40,6 +40,11 @@ case "$1" in
             systemctl restart pulse-xmpp-master-substitute-reconfigurator
             echo "..done"
         fi
+        if systemctl -q is-enabled pulse-xmpp-master-substitute-monitoring ; then
+            echo -n "Restarting pulse-xmpp-master-substitute-monitoring service..."
+            systemctl restart pulse-xmpp-master-substitute-monitoring
+            echo "..done"
+        fi
         ;;
 esac