diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c8bbb5d2a..22ea6b33bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,7 @@ - [FEATURE] Allow to display the name of the used ITSM - [FEATURE] Add user notification - [FEATURE] Use new Medulla branding -- [FEATURE] Add systemctl support in pulse2-setup +- [FEATURE] Add systemctl support in medulla-setup - [BUGFIX] Fix diplay of config files - [BUGFIX] Support Optiplex 3050 in iPXE - [BUGFIX] Fix display of the Master list page when there is a lot of @@ -64,7 +64,7 @@ computers listed. - [BUGFIX] Fix displaying actions depending of the ACLs - [BUGFIX] Fix GLPI 9.3 Compatibility - [BUGFIX] Fix multicast menu synchronisation -- [BUGFIX] Fix pulse2-setup where glpi is on a different port than 3306 +- [BUGFIX] Fix medulla-setup where glpi is on a different port than 3306 - [BUGFIX] Fix GLPI 9.4 Compatibility - [BUGFIX] Fix registration of relay servers - [BUGFIX] Fix inventory for machines from a PXE inventory @@ -133,7 +133,7 @@ popup, etc.) - [BUGFIX] Fix backtrace during deployment - [BUGFIX] Fixes listing of packages for deployment - [BUGFIX] Add acl for relays actions -- [BUGFIX] Fix rendering of accentuated letters from glpi to pulse. +- [BUGFIX] Fix rendering of accentuated letters from glpi to medulla. - [BUGFIX] Fix detection of online/offline machine in the Glpi view - [BUGFIX] Add back addMachinesToCommand function ( fixing restarting convergences) @@ -273,14 +273,14 @@ convergences) [Full Changelog](https://github.com/medulla-tech/medulla/compare/4.6.3...4.6.4) ## [4.6.3](https://github.com/medulla-tech/medulla/releases/tag/4.6.3) (2020-05-19) -- [FEATURE] Manage relay servers from Pulse console +- [FEATURE] Manage relay servers from Medulla console - [FEATURE] Ask reconfiguration of all machines connected to a relay - [FEATURE] List uninventoried machines - [BUGFIX] Fix count of machines in audit view based on deployment statuses [Full Changelog](https://github.com/medulla-tech/medulla/compare/4.6.1...4.6.3) -Pulse 2 4.6.1 +Medulla 2 4.6.1 ============= - [FEATURE] Improve translations - [FEATURE] Allow to use remote database for msc @@ -297,7 +297,7 @@ Pulse 2 4.6.1 - [BUGFIX] Fix systemd service files to automatically restart the services - [BUGFIX] Fix status of convergences ( available, used, etc.) -Pulse 2 4.6.0 +Medulla 2 4.6.0 ============= - [FEATURE] Improve translations - [FEATURE] Add glpi 9.4 support @@ -314,7 +314,7 @@ Pulse 2 4.6.0 - [BUGFIX] Modify the sql request for topology functions - [BUGFIX] Modify the default value when a new machine is added to xmppmaster.machines -Pulse 2 4.5.2 +Medulla 2 4.5.2 ============= - [FEATURE] Allow install of plugin if a specific version of client is met - [FEATURE] Switch from RaphaelJS to d3.js @@ -327,7 +327,7 @@ Pulse 2 4.5.2 - [BUGFIX] Fix reconnection of master agent to xmpp server -Pulse 2 4.5.1 +Medulla 2 4.5.1 ============= - [FEATURE] Expert file download allows download of several files and folders - [FEATURE] File download shows a tree view of the remote filesystem @@ -341,10 +341,10 @@ Pulse 2 4.5.1 - [BUGFIX] Check package format before doing a deployment - [BUGFIX] Do not log machines info and plugins by default - [BUGFIX] Fix abort of deployments on groups in cases where the machines are offline -- [BUGFIX] Fix copy of files when machine is connected to a relay server that is not on main Pulse server +- [BUGFIX] Fix copy of files when machine is connected to a relay server that is not on main Medulla server -Pulse 2 4.5 +Medulla 2 4.5 =========== - [FEATURE] Add glpi 9.2 support - [FEATURE] Add glpi 9.3 support @@ -379,7 +379,7 @@ Pulse 2 4.5 - [BUGFIX] Fix abort of deployments in cases where jidmachine and jidrelay are fake -Pulse 2 4.4.1 +Medulla 2 4.4.1 =========== - [BUGFIX]Fix displaying OSes in 'Operating system' dashboard widget - [BUGFIX] Fix the display of the command executed @@ -395,25 +395,25 @@ Pulse 2 4.4.1 - [BUGFIX] use one database access instead of two - [BUGFIX] Add the config button in the xmpp console page -Pulse 2 4.4 +Medulla 2 4.4 =========== - [FEATURE] Improve registry settings description in config files - [FEATURE] Improve execution of commands by using synchronous operations -- [FEATURE] First version of Pulse Kiosk +- [FEATURE] First version of Medulla Kiosk - [FEATURE] Addition of an inventory step after deployment - [FEATURE] Ability to run a custom quick action on a group - [FEATURE] Creation of sysprep response files for UEFI systems - [BUGFIX] Fix detection of MSI command for 64bit Windows - [BUGFIX] Fix Ajax call for run backup command - [BUGFIX] Fix researching of machine and user OUs -- [BUGFIX] Review dependencies in Pulse packaging +- [BUGFIX] Review dependencies in Medulla packaging - [BUGFIX] Fix calling a plugin from a quick action - [BUGFIX] Fix encoding for deployment stuck in START DEPLOY step - [BUGFIX] Fix downloadfile plugin for launch as a quickaction on groups - [BUGFIX] Fix the saving of registry keys after the inventory - [BUGFIX] Fix the display of machines when registry keys inventories are present -Pulse 2 4.3 +Medulla 2 4.3 ============= - [FEATURE] Enable browsing and download of files from client machines - [FEATURE] Add new logs for dump in support script @@ -424,7 +424,7 @@ Pulse 2 4.3 - [BUGFIX] Fix the problem of editing package when we switch from standard to expert mode - [BUGFIX] Fix restoring of files to macOS clients -Pulse 2 4.2 +Medulla 2 4.2 ============= - [FEATURE] Quick action to install ARS SSH key to Machines - [FEATURE] Allow deployment of python scripts @@ -443,20 +443,20 @@ Pulse 2 4.2 - [BUGFIX] Fix user detection if no user logged in - [BUGFIX] Update translations -Pulse 2 4.1 +Medulla 2 4.1 ============= - [FEATURE] New interface for building complex packages and workflows with dependencies - [FEATURE] New history view that captures all operations -- [FEATURE] Pulse update module widget is now a standalone widget +- [FEATURE] Medulla update module widget is now a standalone widget - [FEATURE] Create and run custom quick actions - [FEATURE] Ability to delay the execution step of deployments based on time, percentage or number of machines having received the package -- [FEATURE] Add support for UEFI in the DHCP server configuration for Pulse imaging +- [FEATURE] Add support for UEFI in the DHCP server configuration for Medulla imaging - [BUGFIX] Fix saving of sysprep answer files - [BUGFIX] Fix the abortion of deployments - [BUGFIX] Fix authentication to GLPI for user provisioning - [BUGFIX] Fix multicast imaging in Debian Stretch -Pulse 2 4.0 +Medulla 2 4.0 ============= * [FEATURE] Use xmpp to deliver messages, orders, etc * [FEATURE] Add glpi 9.1 Support @@ -467,9 +467,9 @@ Pulse 2 4.0 * [BUGFIX] Fix user creation with latest glpi * [BUGFIX] Fix port to php7 -Pulse 2 3.6.0 +Medulla 2 3.6.0 ============= - * [FEATURE] Replacement of historic Pulse PXE by PXELINUX + * [FEATURE] Replacement of historic Medulla PXE by PXELINUX * [FEATURE] Ability to define Clonezilla options for imaging * [FEATURE] Ability to define NFS mounts for imaging client * [BUGFIX] Fix database schemas and format @@ -507,18 +507,18 @@ Pulse 2 3.6.0 * [BUGFIX] Fix mmc webpage layout ( issue #5 ) * [BUGFIX] Associate inventory to a package ( issue #92 ) -Pulse 2 3.3.0 +Medulla 2 3.3.0 ============= * [BUGFIX] Allow to disable backuppc - * [BUGFIX] Enhance systemd support in pulse2-setup + * [BUGFIX] Enhance systemd support in medulla-setup * [FEATURE] Add Multicast support * [BUGFIX] Fix support for new sqlalchemy * [BUGFIX] Fix support for new python-twisted - * [BUGFIX] Fix pulse2-cm initscipt for debian - * [BUGFIX] Removal of pulse2-cm + * [BUGFIX] Fix medulla-cm initscipt for debian + * [BUGFIX] Removal of medulla-cm * [FEATURE] Management of multiple entities in Imaging * [BUGFIX] Fix restore of a specific version of a file - * [FEATURE] Replacement of historic Pulse PXE by PXELINUX + * [FEATURE] Replacement of historic Medulla PXE by PXELINUX @@ -605,7 +605,7 @@ mmc-core 4.4 mmc-core 4.3 -------------- - * [FEATURE] Allow edition of clients config files from Pulse + * [FEATURE] Allow edition of clients config files from Medulla * [FEATURE] Filter computers list on presence status * [BUGFIX] Update translations @@ -630,7 +630,7 @@ mmc-core 4.1 -------------- - [FEATURE] New history view that captures all operations -- [FEATURE] Pulse update module widget is now a standalone widget +- [FEATURE] Medulla update module widget is now a standalone widget - [FEATURE] Create and run custom quick actions - [BUGFIX] Fix authentication to GLPI for user provisioning - [BUGFIX] Fix service module with new systemd @@ -676,7 +676,7 @@ mmc-core 3.0.4 * Bug #1558: Broken user / group lists under IE7 * Bug #1691: Bad mmc-agent PID file handling * Bug #1706: Previous - Next listing behavior - * Bug #1739: pulse2-package-server-register-imaging on python 2.7 + * Bug #1739: medulla-package-server-register-imaging on python 2.7 * Feature #1594: Use localized languages labels on MMC login page * Feature #1671: Man pages for mmc-agent, mmc-helper and mmc-password-helper diff --git a/ChangeLog b/ChangeLog index f1e0266a99..dab935ca59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,7 @@ Medulla 4.6.11 * [FEATURE] Allow to display the name of the used ITSM * [FEATURE] Add user notification * [FEATURE] Use new Medulla branding -* [FEATURE] Add systemctl support in pulse2-setup +* [FEATURE] Add systemctl support in medulla-setup * [BUGFIX] Fix diplay of config files * [BUGFIX] Support Optiplex 3050 in iPXE * [BUGFIX] Fix display of the Master list page when there is a lot of @@ -34,7 +34,7 @@ computers listed. * [BUGFIX] Fix displaying actions depending of the ACLs * [BUGFIX] Fix GLPI 9.3 Compatibility * [BUGFIX] Fix multicast menu synchronisation -* [BUGFIX] Fix pulse2-setup where glpi is on a different port than 3306 +* [BUGFIX] Fix medulla-setup where glpi is on a different port than 3306 * [BUGFIX] Fix GLPI 9.4 Compatibility * [BUGFIX] Fix registration of relay servers * [BUGFIX] Fix inventory for machines from a PXE inventory @@ -56,7 +56,7 @@ computers listed. * [BUGFIX] Fix xmlrpc int limits * [BUGFIX] Fix WOL support -Pulse 2 4.6.9 +Medulla 2 4.6.9 ============= * [FEATURE] Add Team support in Audit page * [FEATURE] Add new infos in the fileviewer as config ( server, port, size @@ -83,7 +83,7 @@ popup, etc.) * [BUGFIX] Add carriage return on "Executed command" info in detail view * [BUGFIX] Fix detection of online machines with glpi 0.84 -Pulse 2 4.6.8 +Medulla 2 4.6.8 ============= * [FEATURE] Disable relay list page from computers menu * [FEATURE] Add utilities to migrate to new package server @@ -101,7 +101,7 @@ Pulse 2 4.6.8 * [BUGFIX] Fix backtrace during deployment * [BUGFIX] Fixes listing of packages for deployment * [BUGFIX] Add acl for relays actions -* [BUGFIX] Fix rendering of accentuated letters from glpi to pulse. +* [BUGFIX] Fix rendering of accentuated letters from glpi to medulla. * [BUGFIX] Fix detection of online/offline machine in the Glpi view * [BUGFIX] Add back addMachinesToCommand function ( fixing restarting convergences) @@ -163,7 +163,7 @@ convergences) * [BUGFIX] Modify concatenation of " bracket from csv generation * [BUGFIX] Fix display of dates in the audit page -Pulse 2 4.6.7 +Medulla 2 4.6.7 ============= * [FEATURE] Order relay list * [FEATURE] Add ACL on the package synchronisation @@ -176,7 +176,7 @@ Pulse 2 4.6.7 * [BUGFIX] Hide convergence if not available. * [BUGFIX] Export CSV -Pulse 2 4.6.6 +Medulla 2 4.6.6 ============= * [FEATURE] Add admin page * [FEATURE] Allow to set up the send of WOL @@ -191,7 +191,7 @@ Pulse 2 4.6.6 * [BUGFIX] Fix the dates when planning a deployment * [BUGFIX] Fix detection of the package server when using pulldirect -Pulse 2 4.6.5 +Medulla 2 4.6.5 ============= * [FEATURE] Add Glpi 9.5 Support * [FEATURE] Support php-fpm by default @@ -214,7 +214,7 @@ Pulse 2 4.6.5 * [BUGFIX] Fix registering the machines if the interface changes * [BUGFIX] Fix wording regarding source of IP address in audit view -Pulse 2 4.6.4 +Medulla 2 4.6.4 ============= * [FEATURE] Add quick actions to relays management * [FEATURE] Guacamole operations are now linked to XMPP inventory instead of GLPI @@ -233,14 +233,14 @@ Pulse 2 4.6.4 * [BUGFIX] Fix update of deployment statuses * [BUGFIX] Fix order in which machines are displayed -Pulse 2 4.6.3 +Medulla 2 4.6.3 ============= -* [FEATURE] Manage relay servers from Pulse console +* [FEATURE] Manage relay servers from Medulla console * [FEATURE] Ask reconfiguration of all machines connected to a relay * [FEATURE] List uninventoried machines * [BUGFIX] Fix count of machines in audit view based on deployment statuses -Pulse 2 4.6.1 +Medulla 2 4.6.1 ============= * [FEATURE] Improve translations * [FEATURE] Allow to use remote database for msc @@ -257,7 +257,7 @@ Pulse 2 4.6.1 * [BUGFIX] Fix systemd service files to automatically restart the services * [BUGFIX] Fix status of convergences ( available, used, etc.) -Pulse 2 4.6.0 +Medulla 2 4.6.0 ============= * [FEATURE] Improve translations * [FEATURE] Add glpi 9.4 support @@ -274,7 +274,7 @@ Pulse 2 4.6.0 * [BUGFIX] Modify the sql request for topology functions * [BUGFIX] Modify the default value when a new machine is added to xmppmaster.machines -Pulse 2 4.5.2 +Medulla 2 4.5.2 ============= * [FEATURE] Allow install of plugin if a specific version of client is met * [FEATURE] Switch from RaphaelJS to d3.js @@ -287,7 +287,7 @@ Pulse 2 4.5.2 * [BUGFIX] Fix reconnection of master agent to xmpp server -Pulse 2 4.5.1 +Medulla 2 4.5.1 ============= * [FEATURE] Expert file download allows download of several files and folders * [FEATURE] File download shows a tree view of the remote filesystem @@ -301,10 +301,10 @@ Pulse 2 4.5.1 * [BUGFIX] Check package format before doing a deployment * [BUGFIX] Do not log machines info and plugins by default * [BUGFIX] Fix abort of deployments on groups in cases where the machines are offline -* [BUGFIX] Fix copy of files when machine is connected to a relay server that is not on main Pulse server +* [BUGFIX] Fix copy of files when machine is connected to a relay server that is not on main Medulla server -Pulse 2 4.5 +Medulla 2 4.5 =========== * [FEATURE] Add glpi 9.2 support * [FEATURE] Add glpi 9.3 support @@ -339,7 +339,7 @@ Pulse 2 4.5 * [BUGFIX] Fix abort of deployments in cases where jidmachine and jidrelay are fake -Pulse 2 4.4.1 +Medulla 2 4.4.1 =========== * [BUGFIX]Fix displaying OSes in 'Operating system' dashboard widget * [BUGFIX] Fix the display of the command executed @@ -355,25 +355,25 @@ Pulse 2 4.4.1 * [BUGFIX] use one database access instead of two * [BUGFIX] Add the config button in the xmpp console page -Pulse 2 4.4 +Medulla 2 4.4 =========== * [FEATURE] Improve registry settings description in config files * [FEATURE] Improve execution of commands by using synchronous operations -* [FEATURE] First version of Pulse Kiosk +* [FEATURE] First version of Medulla Kiosk * [FEATURE] Addition of an inventory step after deployment * [FEATURE] Ability to run a custom quick action on a group * [FEATURE] Creation of sysprep response files for UEFI systems * [BUGFIX] Fix detection of MSI command for 64bit Windows * [BUGFIX] Fix Ajax call for run backup command * [BUGFIX] Fix researching of machine and user OUs -* [BUGFIX] Review dependencies in Pulse packaging +* [BUGFIX] Review dependencies in Medulla packaging * [BUGFIX] Fix calling a plugin from a quick action * [BUGFIX] Fix encoding for deployment stuck in START DEPLOY step * [BUGFIX] Fix downloadfile plugin for launch as a quickaction on groups * [BUGFIX] Fix the saving of registry keys after the inventory * [BUGFIX] Fix the display of machines when registry keys inventories are present -Pulse 2 4.3 +Medulla 2 4.3 ============= * [FEATURE] Enable browsing and download of files from client machines * [FEATURE] Add new logs for dump in support script @@ -384,7 +384,7 @@ Pulse 2 4.3 * [BUGFIX] Fix the problem of editing package when we switch from standard to expert mode * [BUGFIX] Fix restoring of files to macOS clients -Pulse 2 4.2 +Medulla 2 4.2 ============= * [FEATURE] Quick action to install ARS SSH key to Machines * [FEATURE] Allow deployment of python scripts @@ -403,20 +403,20 @@ Pulse 2 4.2 * [BUGFIX] Fix user detection if no user logged in * [BUGFIX] Update translations -Pulse 2 4.1 +Medulla 2 4.1 ============= * [FEATURE] New interface for building complex packages and workflows with dependencies * [FEATURE] New history view that captures all operations -* [FEATURE] Pulse update module widget is now a standalone widget +* [FEATURE] Medulla update module widget is now a standalone widget * [FEATURE] Create and run custom quick actions * [FEATURE] Ability to delay the execution step of deployments based on time, percentage or number of machines having received the package -* [FEATURE] Add support for UEFI in the DHCP server configuration for Pulse imaging +* [FEATURE] Add support for UEFI in the DHCP server configuration for Medulla imaging * [BUGFIX] Fix saving of sysprep answer files * [BUGFIX] Fix the abortion of deployments * [BUGFIX] Fix authentication to GLPI for user provisioning * [BUGFIX] Fix multicast imaging in Debian Stretch -Pulse 2 4.0 +Medulla 2 4.0 ============= * [FEATURE] Use xmpp to deliver messages, orders, etc * [FEATURE] Add glpi 9.1 Support @@ -427,9 +427,9 @@ Pulse 2 4.0 * [BUGFIX] Fix user creation with latest glpi * [BUGFIX] Fix port to php7 -Pulse 2 3.6.0 +Medulla 2 3.6.0 ============= - * [FEATURE] Replacement of historic Pulse PXE by PXELINUX + * [FEATURE] Replacement of historic Medulla PXE by PXELINUX * [FEATURE] Ability to define Clonezilla options for imaging * [FEATURE] Ability to define NFS mounts for imaging client * [BUGFIX] Fix database schemas and format @@ -467,18 +467,18 @@ Pulse 2 3.6.0 * [BUGFIX] Fix mmc webpage layout ( issue #5 ) * [BUGFIX] Associate inventory to a package ( issue #92 ) -Pulse 2 3.3.0 +Medulla 2 3.3.0 ============= * [BUGFIX] Allow to disable backuppc - * [BUGFIX] Enhance systemd support in pulse2-setup + * [BUGFIX] Enhance systemd support in medulla-setup * [FEATURE] Add Multicast support * [BUGFIX] Fix support for new sqlalchemy * [BUGFIX] Fix support for new python-twisted - * [BUGFIX] Fix pulse2-cm initscipt for debian - * [BUGFIX] Removal of pulse2-cm + * [BUGFIX] Fix medulla-cm initscipt for debian + * [BUGFIX] Removal of medulla-cm * [FEATURE] Management of multiple entities in Imaging * [BUGFIX] Fix restore of a specific version of a file - * [FEATURE] Replacement of historic Pulse PXE by PXELINUX + * [FEATURE] Replacement of historic Medulla PXE by PXELINUX @@ -565,7 +565,7 @@ mmc-core 4.4 mmc-core 4.3 -------------- - * [FEATURE] Allow edition of clients config files from Pulse + * [FEATURE] Allow edition of clients config files from Medulla * [FEATURE] Filter computers list on presence status * [BUGFIX] Update translations @@ -590,7 +590,7 @@ mmc-core 4.1 -------------- * [FEATURE] New history view that captures all operations -* [FEATURE] Pulse update module widget is now a standalone widget +* [FEATURE] Medulla update module widget is now a standalone widget * [FEATURE] Create and run custom quick actions * [BUGFIX] Fix authentication to GLPI for user provisioning * [BUGFIX] Fix service module with new systemd @@ -636,7 +636,7 @@ mmc-core 3.0.4 * Bug #1558: Broken user / group lists under IE7 * Bug #1691: Bad mmc-agent PID file handling * Bug #1706: Previous - Next listing behavior - * Bug #1739: pulse2-package-server-register-imaging on python 2.7 + * Bug #1739: medulla-package-server-register-imaging on python 2.7 * Feature #1594: Use localized languages labels on MMC login page * Feature #1671: Man pages for mmc-agent, mmc-helper and mmc-password-helper diff --git a/ChangeLog_fr b/ChangeLog_fr index 3f841c40a7..a38b0faa6b 100644 --- a/ChangeLog_fr +++ b/ChangeLog_fr @@ -1,4 +1,4 @@ -Pulse 2 4.6.9 +Medulla 2 4.6.9 ============= * [FONCTIONNALITE] Ajout du support des Equipe dans la page Audit * [FONCTIONNALITE] Ajout de nouvelles options de configuration dans le @@ -31,7 +31,7 @@ l'AD Bug#1238 Glpi 0.84 -Pulse 2 4.6.8 +Medulla 2 4.6.8 ============= * [FONCTIONNALITE] Suppresion de la liste des relays dans la page Ordinateurs. * [FONCTIONNALITE] Ajout d'un utilitaire afin de migrer vers le nouveau systeme de diff --git a/Doxyfile b/Doxyfile index 63d4bd1087..67342f715a 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "Pulse" +PROJECT_NAME = "Medulla" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -47,7 +47,7 @@ PROJECT_NUMBER = "4.6.8" # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "Pulse" +PROJECT_BRIEF = "Medulla" # With the PROJECT_LOGO tag one can specify a logo or an icon that is included # in the documentation. The maximum height of the logo should not exceed 55 diff --git a/INSTALL b/INSTALL index 7066666a06..e74fda0237 100644 --- a/INSTALL +++ b/INSTALL @@ -11,7 +11,7 @@ without warranty of any kind. Pre-requisites ============ -The following tools are needed in order for Pulse2 to install and run +The following tools are needed in order for Medulla2 to install and run properly: - mmc-core framework - python >= 2.5, with the following modules: @@ -31,7 +31,7 @@ machine or through the network: - MySQL - DHCP server (for imaging purpose) -If you build Pulse2 from scm repository, you will also need the following tools +If you build Medulla2 from scm repository, you will also need the following tools (not needed if you use the .tar.gz archive): - autoconf - automake @@ -49,9 +49,9 @@ $ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var $ make $ sudo make install -The `pulse2-setup' tool can then be used to provision databases, +The `medulla-setup' tool can then be used to provision databases, setup and check configuration files, etc. If you plan to use imaging -service, please read the following section, as pulse2-setup does not +service, please read the following section, as medulla-setup does not handle with its configuration. Quick imaging client installation @@ -63,10 +63,10 @@ For your convenience, prebuilt binaries are available, so that you can install it on a server which is not i386. Once you have downloaded prebuilt binaries as -pulse2-imaging-client-_i386.tar.gz, simply run the following, as root: -$ tar xfC pulse2-imaging-client-_i386.tar.gz / +medulla-imaging-client-_i386.tar.gz, simply run the following, as root: +$ tar xfC medulla-imaging-client-_i386.tar.gz / -All files are extracted in /var/lib/pulse2/imaging/ dir. +All files are extracted in /var/lib/medulla/imaging/ dir. As to serve the imaging client to the machines, you must then configure the following network services. @@ -75,9 +75,9 @@ NFS --- In `/etc/exports' file, add the following lines: -/var/lib/pulse2/imaging/computers *(async,rw,no_root_squash,subtree_check) -/var/lib/pulse2/imaging/masters *(async,rw,no_root_squash,subtree_check) -/var/lib/pulse2/imaging/postinst *(async,ro,no_root_squash,subtree_check) +/var/lib/medulla/imaging/computers *(async,rw,no_root_squash,subtree_check) +/var/lib/medulla/imaging/masters *(async,rw,no_root_squash,subtree_check) +/var/lib/medulla/imaging/postinst *(async,ro,no_root_squash,subtree_check) Then reload the new NFS configuration, as root: $ exportfs -r -a @@ -87,7 +87,7 @@ DHCP The DHCP server on your network must be configured to serve bootload through PXE protocol. You can find an example file for dhcp3 server in -`/usr/share/doc/pulse2/contrib/dhcp/dhcpd.conf'. +`/usr/share/doc/medulla/contrib/dhcp/dhcpd.conf'. TFTP ---- @@ -96,7 +96,7 @@ Bootloader and kernel are served to the client with TFTP protocol. We recommend using the atftpd server. You must configure the TFTP server to use as base directory: -`/var/lib/pulse2/imaging'. +`/var/lib/medulla/imaging'. `configure' Invocation ====================== @@ -163,19 +163,19 @@ operates. Quick installation : devel branch ============================ -In tools repository, 'install-pulse-git' allow a quick setup. -./install-pulse-git \ - --pulse-repo-url= \ +In tools repository, 'install-medulla-git' allow a quick setup. +./install-medulla-git \ + --medulla-repo-url= \ --root-password= \ --org-name= \ --interface-to-clients= \ - --enable-pulse-main=[g]lpi[d]hcp|[p]xe | --enable-multisite=[d]hcp|[p]xe|[b]ackuppc \ + --enable-medulla-main=[g]lpi[d]hcp|[p]xe | --enable-multisite=[d]hcp|[p]xe|[b]ackuppc \ --create-entity \ --entity= \ --dhcp-dns-server= \ --dhcp-gateway-address= \ - --interface-to-main-pulse= \ - --main-pulse-ip= \ + --interface-to-main-medulla= \ + --main-medulla-ip= \ --glpi-url= \ --glpi-dbhost= \ --glpi-dbname= \ diff --git a/Makefile.am b/Makefile.am index 91cb8f22e2..57ad379b04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # # $Id$ # -# This file is part of Mandriva Pulse2 project. +# This file is part of Mandriva Medulla2 project. # # This software is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ install-data-hook: @echo '### If using dynamic backend (from OpenLDAP 2.3), schema must be converted' @echo '### in LDIF format.' @echo '### You can use "mmc-add-schema" to convert and add the schema.' - @echo '### Schema file is available in: $(datadir)/doc/pulse2/contrib/base/mmc.schema' + @echo '### Schema file is available in: $(datadir)/doc/medulla/contrib/base/mmc.schema' @echo '###' prereqs: diff --git a/README.md b/README.md index 8a7d9c9ddf..efa3b7b8ab 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Pulse +# Medulla -[![Build Status](https://travis-ci.org/pulse-project/pulse2.svg?branch=master)](https://travis-ci.org/pulse-project/pulse2/branches) +[![Build Status](https://travis-ci.org/medulla-tech/medulla.svg?branch=master)](https://travis-ci.org/medulla-tech/medulla/branches) -Pulse is a radically simple IT automation and lifecycle management tool that offers the ability to handle repetitive tasks, quickly deploy applications, operating system and proactively manage them all where ever they are. +Medulla is a radically simple IT automation and lifecycle management tool that offers the ability to handle repetitive tasks, quickly deploy applications, operating system and proactively manage them all where ever they are. -Pulse provides a real-time management solution for complex and distributed environments. +Medulla provides a real-time management solution for complex and distributed environments. ## Main feature : @@ -25,29 +25,29 @@ Pulse provides a real-time management solution for complex and distributed envir * Stable branch and previous tagged version -Read INSTALL files of each project (first mmc-core and pulse2) +Read INSTALL files of each project (first mmc-core and medulla) * Devel branch Installation process had been simplified to easily install all differents components from one command line. -[Easy install process](https://github.com/pulse-project/tools/tree/master/install) +[Easy install process](https://github.com/medulla-tech/tools/tree/master/install) ## Supported clients -Pulse manage either windows (from 7 to lastest CBB and LTSB), linux and Mac OSX +Medulla manage either windows (from 7 to lastest CBB and LTSB), linux and Mac OSX ## Documentation -Read [documentation](http://pulse-user-manual.readthedocs.org/) +Read [documentation](http://medulla-user-manual.readthedocs.org/) Read [code documentation](http://doc.siveo.net/) ## Community -* Access community [Pulse forum](https://forum.pulse2.fr/) +* Access community [Medulla forum](https://forum.medulla.fr/) * Discuss on IRC chanel [irc.freenode.net](irc.freenode.net) - * Channel : #pulse-fr - * Channel : #pulse-en + * Channel : #medulla-fr + * Channel : #medulla-en * Discord Channel: https://discord.gg/NfTeZkgZ diff --git a/agent/conf/Makefile.am b/agent/conf/Makefile.am index 767ac4b276..6a389f4db1 100644 --- a/agent/conf/Makefile.am +++ b/agent/conf/Makefile.am @@ -25,7 +25,7 @@ nobase_dist_mmcconf_DATA = plugins/ppolicy.ini plugins/dashboard.ini plugins/rep agent/keys/cacert.pem agent/keys/localcert.pem plugins/report/indicators.xml \ plugins/report/indicators_inventory.xml \ plugins/report/templates/default.xml plugins/report/img/mandriva.png \ - plugins/report/img/pulse.png plugins/report/css/style.css plugins/report/css/graph.css + plugins/report/img/medulla.png plugins/report/css/style.css plugins/report/css/graph.css nobase_nodist_mmcconf_DATA = agent/config.ini plugins/base.ini plugins/services.ini EXTRA_DIST = agent/config.ini.in plugins/base.ini.in plugins/services.ini.in diff --git a/agent/conf/plugins/base.ini.in b/agent/conf/plugins/base.ini.in index a1f02cd972..bf971c746f 100644 --- a/agent/conf/plugins/base.ini.in +++ b/agent/conf/plugins/base.ini.in @@ -79,7 +79,7 @@ path = @libdir@/mmc/backup-tools # Where are put the archives destpath = /home/archives -# Computer inventory plugin to use (Pulse 2 related option) +# Computer inventory plugin to use (Medulla 2 related option) # [computers] # method = glpi # method = inventory diff --git a/agent/conf/plugins/report.ini b/agent/conf/plugins/report.ini index f93f7abc27..b96cf772f1 100644 --- a/agent/conf/plugins/report.ini +++ b/agent/conf/plugins/report.ini @@ -28,4 +28,4 @@ company = Company # logos must be put in mmc_plugin_dir/report/img/ # You can use only PNG files, no JPG company_logo_path = mandriva.png -pulse_logo_path = pulse.png +medulla_logo_path = medulla.png diff --git a/agent/conf/plugins/report/img/pulse.png b/agent/conf/plugins/report/img/medulla.png similarity index 100% rename from agent/conf/plugins/report/img/pulse.png rename to agent/conf/plugins/report/img/medulla.png diff --git a/agent/conf/plugins/services.ini.in b/agent/conf/plugins/services.ini.in index 03569a7350..39601b612a 100644 --- a/agent/conf/plugins/services.ini.in +++ b/agent/conf/plugins/services.ini.in @@ -9,4 +9,4 @@ mail = dovecot,postfix,amavis,amavisd network = isc-dhcp-server,dhcpd,bind9,named,named-sdb shorewall = shorewall squid = squid -base = mmc-agent,pulse2-package-server,pulse-xmpp-agent-relay,pulse2-register-pxe,pulse-xmpp-agent-log,pulse-package-watching,pulse-xmpp-master-substitute-all,pulse-xmpp-master-substitute-inventory,pulse-xmpp-master-substitute-registration,pulse-xmpp-master-substitute-assessor,pulse-xmpp-master-substitute-deployment,pulse-xmpp-master-substitute-subscription,pulse-xmpp-master-substitute-logger,pulse-xmpp-master-substitute-reconfigurator,pulse-xmpp-master-substitute-monitoring +base = mmc-agent,medulla-package-server,medulla-agent-relay,medulla-register-pxe,medulla-agent-log,medulla-package-watching,medulla-master-substitute-all,medulla-master-substitute-inventory,medulla-master-substitute-registration,medulla-master-substitute-assessor,medulla-master-substitute-deployment,medulla-master-substitute-subscription,medulla-master-substitute-logger,medulla-master-substitute-reconfigurator,medulla-master-substitute-monitoring diff --git a/agent/contrib/Makefile.am b/agent/contrib/Makefile.am index 1d02aa67d1..3390820859 100644 --- a/agent/contrib/Makefile.am +++ b/agent/contrib/Makefile.am @@ -20,7 +20,7 @@ # Author(s) # Jean Parpaillon # -contribdir = $(datadir)/doc/pulse2/contrib +contribdir = $(datadir)/doc/medulla/contrib nobase_dist_contrib_DATA = audit/sql/install.sh \ audit/sql/schema-2.sql \ diff --git a/agent/contrib/audit/sql/schema-2.sql b/agent/contrib/audit/sql/schema-2.sql index a13cf8f1db..7eba4712e0 100644 --- a/agent/contrib/audit/sql/schema-2.sql +++ b/agent/contrib/audit/sql/schema-2.sql @@ -16,7 +16,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with Pulse 2; if not, write to the Free Software +-- along with Medulla 2; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -- MA 02110-1301, USA. diff --git a/agent/contrib/report/sql/schema-001.sql b/agent/contrib/report/sql/schema-001.sql index 3cb255c982..f60453722f 100644 --- a/agent/contrib/report/sql/schema-001.sql +++ b/agent/contrib/report/sql/schema-001.sql @@ -3,20 +3,20 @@ -- -- $Id$ -- --- This file is part of Pulse 2, http://pulse2.mandriva.org +-- This file is part of Medulla 2, http://medulla.mandriva.org -- --- Pulse 2 is free software; you can redistribute it and/or modify +-- Medulla 2 is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- --- Pulse 2 is distributed in the hope that it will be useful, +-- Medulla 2 is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with Pulse 2; if not, write to the Free Software +-- along with Medulla 2; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -- MA 02110-1301, USA. diff --git a/agent/contrib/report/sql/schema-002.sql b/agent/contrib/report/sql/schema-002.sql index ae729cb74b..4c59f9087b 100644 --- a/agent/contrib/report/sql/schema-002.sql +++ b/agent/contrib/report/sql/schema-002.sql @@ -3,20 +3,20 @@ -- -- $Id$ -- --- This file is part of Pulse 2, http://pulse2.mandriva.org +-- This file is part of Medulla 2, http://medulla.mandriva.org -- --- Pulse 2 is free software; you can redistribute it and/or modify +-- Medulla 2 is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- --- Pulse 2 is distributed in the hope that it will be useful, +-- Medulla 2 is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with Pulse 2; if not, write to the Free Software +-- along with Medulla 2; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -- MA 02110-1301, USA. diff --git a/agent/contrib/report/sql/schema-003.sql b/agent/contrib/report/sql/schema-003.sql index 4d68b4f30a..cb9c34d807 100644 --- a/agent/contrib/report/sql/schema-003.sql +++ b/agent/contrib/report/sql/schema-003.sql @@ -3,20 +3,20 @@ -- -- $Id$ -- --- This file is part of Pulse 2, http://pulse2.mandriva.org +-- This file is part of Medulla 2, http://medulla.mandriva.org -- --- Pulse 2 is free software; you can redistribute it and/or modify +-- Medulla 2 is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- --- Pulse 2 is distributed in the hope that it will be useful, +-- Medulla 2 is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with Pulse 2; if not, write to the Free Software +-- along with Medulla 2; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -- MA 02110-1301, USA. diff --git a/agent/mmc/agent.py b/agent/mmc/agent.py index aa3119bfa6..edcd81eb59 100644 --- a/agent/mmc/agent.py +++ b/agent/mmc/agent.py @@ -68,7 +68,7 @@ import ssl import gzip -from pulse2.database.xmppmaster import XmppMasterDatabase +from medulla.database.xmppmaster import XmppMasterDatabase from datetime import datetime, timedelta logger = logging.getLogger() @@ -79,8 +79,6 @@ ctx = None VERSION = "5.1.0" -PYTHON_VERSION = sys.version_info.major - class xmppbrowsing: """ """ @@ -116,16 +114,8 @@ def listfileindir1(self, path_abs_current=None): # TODO: Remove MIGRATION3 self.dirinfos = { "path_abs_current": pathabs, - "list_dirs_current": ( - os.walk(pathabs).next()[1] - if PYTHON_VERSION == 2 - else next(os.walk(pathabs))[1] - ), - "list_files_current": ( - os.walk(pathabs).next()[2] - if PYTHON_VERSION == 2 - else next(os.walk(pathabs))[2] - ), + "list_dirs_current": (next(os.walk(pathabs))[1]), + "list_files_current": (next(os.walk(pathabs))[2]), "parentdir": os.path.abspath(os.path.join(pathabs, os.pardir)), "rootfilesystem": self.rootfilesystem, "defaultdir": self.defaultdir, @@ -144,11 +134,7 @@ def listfileindir(self, path_abs_current=None): else: pathabs = self.rootfilesystem # TODO: Remove MIGRATION3 - list_files_current = ( - os.walk(pathabs).next()[2] - if PYTHON_VERSION == 2 - else next(os.walk(pathabs))[2] - ) + list_files_current = next(os.walk(pathabs))[2] ff = [] for t in list_files_current: fii = os.path.join(pathabs, t) @@ -156,11 +142,7 @@ def listfileindir(self, path_abs_current=None): # TODO: Remove MIGRATION3 self.dirinfos = { "path_abs_current": pathabs, - "list_dirs_current": ( - os.walk(pathabs).next()[1] - if PYTHON_VERSION == 2 - else next(os.walk(pathabs))[1] - ), + "list_dirs_current": (next(os.walk(pathabs))[1]), "list_files_current": ff, "parentdir": os.path.abspath(os.path.join(pathabs, os.pardir)), "rootfilesystem": self.rootfilesystem, @@ -1120,7 +1102,7 @@ def send_message(self, mto, msg): logger.error("type msg pas compatible %s" % type(msg)) return None - def iqsendpulse(self, mto, msg, timeout): + def iqsendmedulla(self, mto, msg, timeout): return self.send_iq(mto, msg, timeout) def send_iq(self, mto, msg, timeout): @@ -1238,7 +1220,7 @@ def send_call_plugin(self, msg): # addition des metadatas de message. msg["metadatas"] = { "type": "plugin", - "to": "master@pulse/MASTER", + "to": "master@medulla/MASTER", "timeout": 0, } messagesend = json.dumps(msg, indent=4) @@ -2387,10 +2369,10 @@ def init_master_substitut(self): # -------------------------------------------------------------------------------------------------- # --------------------------------- call plugin sur 1 acteur en xmpp ------------------------------- - # test envoi mesage to machine dev-deb12-2.zb0@pulse/525400944ac7 + # test envoi mesage to machine dev-deb12-2.zb0@medulla/525400944ac7 # logger.info("Start/restart MMC creation canal commande xmpp3") - # ree = self.modulexmppmaster.send_message('dev-deb12-2.zb0@pulse/525400944ac7', + # ree = self.modulexmppmaster.send_message('dev-deb12-2.zb0@medulla/525400944ac7', # {"action": "ping", # "data": { "text" : "message" }} ) # -------------------------------------------------------------------------------------------------- @@ -2399,7 +2381,7 @@ def init_master_substitut(self): # -------------------------------------------------------------------------------------------------- # --------------------------------- call iq synchrone sur sur 1 acteur en xmpp ------------------------------- # test de machinessend_iq(mto, msg, timeout): - # ree= self.modulexmppmaster.send_iq('dev-deb12-2.zb0@pulse/525400944ac7', + # ree= self.modulexmppmaster.send_iq('dev-deb12-2.zb0@medulla/525400944ac7', # { "action": "test", # "data": { # "listinformation": ["get_ars_key_id_rsa", "keypub"], @@ -2708,11 +2690,11 @@ def loadPlugins(self): plugins.remove("base") plugins.insert(0, "base") - # Put pulse2 plugins as the last to be imported, else we may get a mix - # up with pulse2 module available in the main python path - if "pulse2" in plugins: - plugins.remove("pulse2") - plugins.append("pulse2") + # Put medulla plugins as the last to be imported, else we may get a mix + # up with medulla module available in the main python path + if "medulla" in plugins: + plugins.remove("medulla") + plugins.append("medulla") # Load plugins logger.info("Importing available MMC plugins") diff --git a/agent/mmc/database/database_helper.py b/agent/mmc/database/database_helper.py index 9cefbc1a90..f792f0c4cf 100644 --- a/agent/mmc/database/database_helper.py +++ b/agent/mmc/database/database_helper.py @@ -6,7 +6,7 @@ """ Define classes to help implementing the database access in all the -pulse2 modules. +medulla modules. """ import functools import logging @@ -53,7 +53,7 @@ def db_check(self): return False if conn := self.connected(): - # Glpi is an external DB, its version is not managed by Pulse + # Glpi is an external DB, its version is not managed by Medulla if self.my_name == "Glpi": return True diff --git a/agent/mmc/database/ddl.py b/agent/mmc/database/ddl.py index d9775a2b2c..896bba1967 100755 --- a/agent/mmc/database/ddl.py +++ b/agent/mmc/database/ddl.py @@ -22,7 +22,7 @@ # This logger is created only for the case when this module # is called as standallone. -# (usualy is called by pulse2-setup with a passed logger) +# (usualy is called by medulla-setup with a passed logger) def myLogger(): """Default logging instance""" log = logging.getLogger("DDL") @@ -198,7 +198,7 @@ def get_scripts(self, module, fullpath=False): @rtype: string """ sqldir = os.path.join( - prefix, "share", "doc", "pulse2", "contrib", module, "sql" + prefix, "share", "doc", "medulla", "contrib", module, "sql" ) if not os.path.exists(sqldir): diff --git a/agent/mmc/plugins/base/externalldap.py b/agent/mmc/plugins/base/externalldap.py index 58b58539fe..47684c52f2 100644 --- a/agent/mmc/plugins/base/externalldap.py +++ b/agent/mmc/plugins/base/externalldap.py @@ -324,7 +324,7 @@ def doProvisioning(self, authtoken): self.logger.info( f"****Setting user '{uid}' entities corresponding to user profile '{profile}': {str(entities)}" ) - from pulse2.database.inventory import Inventory + from medulla.database.inventory import Inventory Inventory().setUserEntities(uid, entities) diff --git a/agent/mmc/plugins/base/subscription.py b/agent/mmc/plugins/base/subscription.py index 661edc70d2..cf401fdfc4 100644 --- a/agent/mmc/plugins/base/subscription.py +++ b/agent/mmc/plugins/base/subscription.py @@ -21,8 +21,8 @@ class SubscriptionConfig: is_subscribe_done = False subs_possible_product_names = [ - "Pulse 2", - "CloudPulse", + "Medulla 2", + "CloudMedulla", "MDS", "Mandriva Directory Server", "Mandriva Business Server Soho", diff --git a/agent/mmc/plugins/dashboard/panel.py b/agent/mmc/plugins/dashboard/panel.py index b9bf4c85ac..3ee0464905 100644 --- a/agent/mmc/plugins/dashboard/panel.py +++ b/agent/mmc/plugins/dashboard/panel.py @@ -93,7 +93,7 @@ def serialize(self): class ProcessPanel(Panel): def serialize(self): exitcode, stdout, stderr = shlaunch( - "ps aux | grep 'pulse\|mmc' | grep -v 'defunct' | grep -v 'grep' | awk '{ if ($11 == \"/usr/bin/python\" || $11 == \"python\" || $11 == \"/bin/sh\") print $12; else print $11 }'" + "ps aux | grep 'medulla\|mmc' | grep -v 'defunct' | grep -v 'grep' | awk '{ if ($11 == \"/usr/bin/python\" || $11 == \"python\" || $11 == \"/bin/sh\") print $12; else print $11 }'" ) return ( { @@ -113,7 +113,7 @@ class ComputersOnlinePanel(Panel): class UpdatePanel(Panel): - """This class is called by the Pulse Update widget from the dashboard""" + """This class is called by the Medulla Update widget from the dashboard""" pass diff --git a/agent/mmc/plugins/report/__init__.py b/agent/mmc/plugins/report/__init__.py index 7ada46f69f..e5c01bcfc7 100644 --- a/agent/mmc/plugins/report/__init__.py +++ b/agent/mmc/plugins/report/__init__.py @@ -19,9 +19,9 @@ logger = logging.getLogger() # try: -# from pulse2.managers.location import ComputerLocationManager +# from medulla.managers.location import ComputerLocationManager # except ImportError: -# logger.warn("report: I can't load Pulse ComputerLocationManager") +# logger.warn("report: I can't load Medulla ComputerLocationManager") from mmc.support.mmctools import RpcProxyI, ContextMakerI, SecurityContext from mmc.core.tasks import TaskManager from mmc.core.version import scmRevision @@ -241,7 +241,7 @@ def generate_report_from_csv(self, csv_files, delimiter="|", lang="C"): "__USERNAME__": self.currentContext.userid, "__COMPANY__": self.config.company, "__COMPANY_LOGO_PATH__": self.config.company_logo_path, - "__PULSE_LOGO_PATH__": self.config.pulse_logo_path, + "__PULSE_LOGO_PATH__": self.config.medulla_logo_path, } pdf = PDFGenerator(path=pdf_path, locale=locale) @@ -420,7 +420,7 @@ def generate_report(self, period, sections, tables, items, entities, lang): # getLocationName = ComputerLocationManager().getLocationName # entity_names = dict([(location, getLocationName([location]).decode('utf-8')) for location in entities]) # except NameError: - # logger.warn("Pulse ComputerLocationManager() not loaded") + # logger.warn("Medulla ComputerLocationManager() not loaded") # entity_names = {} # Parsing report XML xmltemp = ET.parse( @@ -440,7 +440,7 @@ def generate_report(self, period, sections, tables, items, entities, lang): "__USERNAME__": self.currentContext.userid, "__COMPANY__": self.config.company, "__COMPANY_LOGO_PATH__": self.config.company_logo_path, - "__PULSE_LOGO_PATH__": self.config.pulse_logo_path, + "__PULSE_LOGO_PATH__": self.config.medulla_logo_path, } xls = XLSGenerator(path=xls_path) diff --git a/agent/mmc/plugins/report/config.py b/agent/mmc/plugins/report/config.py index 0419ed397e..e2b055d3d2 100644 --- a/agent/mmc/plugins/report/config.py +++ b/agent/mmc/plugins/report/config.py @@ -61,8 +61,8 @@ def readConf(self): except (NoOptionError, NoSectionError): self.company_logo_path = f"{report_img_path}mandriva.png" try: - self.pulse_logo_path = report_img_path + self.get( - "pdfvars", "pulse_logo_path" + self.medulla_logo_path = report_img_path + self.get( + "pdfvars", "medulla_logo_path" ) except (NoOptionError, NoSectionError): - self.pulse_logo_path = f"{report_img_path}pulse.png" + self.medulla_logo_path = f"{report_img_path}medulla.png" diff --git a/bump.sh b/bump.sh index ddb1bb3eb8..cad19f7f0a 100755 --- a/bump.sh +++ b/bump.sh @@ -16,8 +16,8 @@ if [ ! -z $1 ]; then git diff -# git commit -a -m "pulse: bump version to $1" - #git tag -s pulse_$1 -m "pulse_$1" +# git commit -a -m "medulla: bump version to $1" + #git tag -s medulla_$1 -m "medulla_$1" #git push #git push --tags diff --git a/clean.sh b/clean.sh index cc577c0206..4e535a1236 100755 --- a/clean.sh +++ b/clean.sh @@ -28,4 +28,4 @@ for file in $AUTOGEN_FILES; do ( cd $(dirname $0) && rm -rfv $file ) done -rm -fv pulse*tar.* +rm -fv medulla*tar.* diff --git a/configure.ac b/configure.ac index 40005e38c7..d9e122fc58 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl configure.in for Pulse2 project. +dnl configure.in for Medulla2 project. dnl (c) 2011 mandriva, http://www.mandriva.com dnl dnl This file is part of Mandriva Management Console (MMC). @@ -195,12 +195,12 @@ AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([services/Makefile]) AC_CONFIG_FILES([services/bin/Makefile]) AC_CONFIG_FILES([services/mmc/Makefile]) -AC_CONFIG_FILES([services/pulse2/Makefile]) -AC_CONFIG_FILES([services/pulse2/version.py]) +AC_CONFIG_FILES([services/medulla/Makefile]) +AC_CONFIG_FILES([services/medulla/version.py]) AC_CONFIG_FILES([services/contrib/Makefile]) AC_CONFIG_FILES([services/conf/Makefile]) AC_CONFIG_FILES([services/conf/plugins/Makefile]) -AC_CONFIG_FILES([services/conf/pulse2/Makefile]) +AC_CONFIG_FILES([services/conf/medulla/Makefile]) AC_CONFIG_FILES([services/init.d/Makefile]) AC_CONFIG_FILES([web/Makefile]) AC_CONFIG_FILES([web/modules/medulla_server/version.php]) @@ -226,5 +226,5 @@ dnl Warn user sysconfdir is not /etc, if necessary. make confwarning echo "###" -echo "### End of pulse2 configuration" +echo "### End of medulla configuration" echo "###" diff --git a/debian/control b/debian/control index b8835914c6..cb593b07c5 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: extra Maintainer: Nicolas Lécureuil Build-Depends: debhelper (>= 5.0.37.2), lsb-release, python3-all (>= 3.9), gettext, autotools-dev, xsltproc, docbook-xsl, docbook-xml Standards-Version: 3.9.3 -Homepage: https://github.com/pulse-project/pulse2 +Homepage: https://github.com/medulla-tech/medulla X-Python-Version: >= 3.9 -Package: pulse2 +Package: medulla Architecture: all Depends: ${misc:Depends}, mmc-agent, mmc-web-base, python3-mmc-base, @@ -17,7 +17,7 @@ Depends: ${misc:Depends}, python3-mmc-inventory | python3-mmc-glpi, mmc-web-msc, python3-mmc-msc, mmc-web-pkgs, python3-mmc-pkgs, - mmc-web-pulse2, python3-mmc-pulse2, + mmc-web-medulla, python3-mmc-medulla, mmc-web-kiosk, python3-mmc-kiosk, mmc-web-urbackup, python3-mmc-urbackup, mmc-web-dashboard, python3-mmc-dashboard, @@ -26,143 +26,156 @@ Depends: ${misc:Depends}, mmc-web-support, python3-mmc-support, mmc-web-xmppmaster, python3-mmc-xmppmaster, mmc-web-updates, python3-mmc-updates, - pulse2-uuid-resolver, + medulla-uuid-resolver, mmc-web-admin, python3-mmc-admin, - pulse-xmppmaster-agentplugins, pulse-xmpp-agent-relay, - pulse-agent-installers, pulse2-common, - pulse2-imaging-client | pulse2-davos-client, - pulse-imaging-scripts, - pulse2-homepage -Description: Pulse 2 metapackage - This empty package depends on all Pulse2/MMC required packages. - + medullamaster-agentplugins, medulla-agent-relay, + medulla-agent-installers, medulla-common, + medulla-imaging-client | medulla-davos-client, + medulla-imaging-scripts, + medulla-homepage +Description: Medulla 2 metapackage + This empty package depends on all Medulla2/MMC required packages. + +#TODO: Remove forMedulla 5.3.0 Package: pulse2-common Architecture: all Section: python Depends: ${python:Depends}, ${misc:Depends}, p7zip-full, python3-configobj, curl, nsis, dnsutils, python3-psutil (>= 0.6.1), rpm (>= 4.8), python3-netifaces, python3-netaddr -Description: Pulse 2 common files (doc) - Pulse 2 is Open Source computer system management for medium and large +Conflicts: pulse2-common +Description: Medulla 2 common files (doc) + Medulla 2 is Open Source computer system management for medium and large + organizations. + . + This package contains Medulla common files like documentation. + +Package: medulla-common +Architecture: all +Section: python +Depends: ${python:Depends}, ${misc:Depends}, p7zip-full, python3-configobj, curl, nsis, dnsutils, python3-psutil (>= 0.6.1), rpm (>= 4.8), python3-netifaces, python3-netaddr +Conflicts: pulse2-common +Description: Medulla 2 common files (doc) + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common files like documentation. + This package contains Medulla common files like documentation. -Package: pulse2-tests +Package: medulla-tests Architecture: all Section: python Depends: ${python:Depends}, ${misc:Depends}, p7zip-full, python3-configobj, curl, nsis, dnsutils, python3-psutil (>= 0.6.1), rpm (>= 4.8) -Description: Pulse 2 regression tests - Pulse 2 is Open Source computer system management for medium and large +Description: Medulla 2 regression tests + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common files like documentation. + This package contains Medulla 2 common files like documentation. -Package: python3-pulse2-common-database-dyngroup +Package: python3-medulla-common-database-dyngroup Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database (= ${binary:Version}) -Description: Pulse 2 common dynamic groups database files - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database (= ${binary:Version}) +Description: Medulla 2 common dynamic groups database files + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common dynamic groups database files. + This package contains Medulla 2 common dynamic groups database files. -Package: python3-pulse2-common-database-inventory +Package: python3-medulla-common-database-inventory Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database-dyngroup (= ${binary:Version}) -Description: Pulse 2 common inventory database files - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database-dyngroup (= ${binary:Version}) +Description: Medulla 2 common inventory database files + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common inventory database files. + This package contains Medulla 2 common inventory database files. -Package: python3-pulse2-common-database-admin +Package: python3-medulla-common-database-admin Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}) -Description: Pulse 2 common admin database files - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}) +Description: Medulla 2 common admin database files + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common admin database files. + This package contains Medulla 2 common admin database files. -Package: python3-pulse2-common-database-msc +Package: python3-medulla-common-database-msc Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database (= ${binary:Version}) -Description: Pulse 2 common MSC database files - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database (= ${binary:Version}) +Description: Medulla 2 common MSC database files + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common MSC database files. + This package contains Medulla 2 common MSC database files. -Package: python3-pulse2-common-database-imaging +Package: python3-medulla-common-database-imaging Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database (= ${binary:Version}) -Description: Pulse 2 common imaging database files. - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database (= ${binary:Version}) +Description: Medulla 2 common imaging database files. + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common imaging database files. + This package contains Medulla 2 common imaging database files. -Package: python3-pulse2-common-database-backuppc +Package: python3-medulla-common-database-backuppc Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database (= ${binary:Version}) -Description: Pulse 2 common backuppc database files. - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database (= ${binary:Version}) +Description: Medulla 2 common backuppc database files. + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common BackupPC database files. + This package contains Medulla 2 common BackupPC database files. -Package: python3-pulse2-common-database +Package: python3-medulla-common-database Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common (= ${binary:Version}), python3-mmc-database (>= 3.1.1-1) -Description: Pulse 2 common database files - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common (= ${binary:Version}), python3-mmc-database (>= 3.1.1-1) +Description: Medulla 2 common database files + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common database files. + This package contains Medulla 2 common database files. -Package: python3-pulse2-common +Package: python3-medulla-common Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-twisted (>= 2.4.0) -Description: Pulse 2 common files - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-twisted (>= 2.4.0) +Description: Medulla 2 common files + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 common files. + This package contains Medulla 2 common files. -Package: pulse2-inventory-server +Package: medulla-inventory-server Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common (= ${binary:Version}), python3-pulse2-common-database-inventory (= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-openssl, python3-pyinotify -Description: Pulse 2 inventory server - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common (= ${binary:Version}), python3-medulla-common-database-inventory (= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-openssl, python3-pyinotify +Description: Medulla 2 inventory server + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains Pulse 2 inventory server. It collects computers + This package contains Medulla 2 inventory server. It collects computers inventories and insert them into the database. -Package: python3-mmc-pulse2 +Package: python3-mmc-medulla Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-mmc-msc (= ${binary:Version}), python3-mmc-inventory (= ${binary:Version}) | python3-mmc-glpi (= ${binary:Version}), python3-mmc-dyngroup (= ${binary:Version}), python3-mmc-pkgs (= ${binary:Version}), python3-pulse2-common (= ${binary:Version}), python3-sqlalchemy (>= 0.4) +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-mmc-msc (= ${binary:Version}), python3-mmc-inventory (= ${binary:Version}) | python3-mmc-glpi (= ${binary:Version}), python3-mmc-dyngroup (= ${binary:Version}), python3-mmc-pkgs (= ${binary:Version}), python3-medulla-common (= ${binary:Version}), python3-sqlalchemy (>= 0.4) Recommends: python3-mmc-imaging -Description: Pulse 2 MMC agent plugins - Pulse 2 is Open Source computer system management for medium and large +Description: Medulla 2 MMC agent plugins + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins. + This package will install all the Medulla 2 MMC agent interface plugins. Package: python3-mmc-msc Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-pulse2-common-database-msc (= ${binary:Version}) -Description: Pulse 2 MSC plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-medulla-common-database-msc (= ${binary:Version}) +Description: Medulla 2 MSC plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the MSC plugin for the MMC @@ -172,9 +185,9 @@ Description: Pulse 2 MSC plugin for MMC agent Package: python3-mmc-inventory Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-pulse2-common-database-inventory (= ${binary:Version}) -Description: Pulse 2 inventory plugin for MMC agent - Pulse 2 provides application and update deployment mechanisms for large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-medulla-common-database-inventory (= ${binary:Version}) +Description: Medulla 2 inventory plugin for MMC agent + Medulla 2 provides application and update deployment mechanisms for large organizations. . This package contains the inventory plugin for the MMC agent. @@ -182,9 +195,9 @@ Description: Pulse 2 inventory plugin for MMC agent Package: python3-mmc-glpi Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-sqlalchemy (>= 0.4), python3-mysqldb (>= 1.2.1), python3-pulse2-common (= ${binary:Version}) -Description: Pulse 2 GLPI plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-sqlalchemy (>= 0.4), python3-mysqldb (>= 1.2.1), python3-medulla-common (= ${binary:Version}) +Description: Medulla 2 GLPI plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the GLPI plugin for the MMC agent. It connects to a @@ -194,9 +207,9 @@ Description: Pulse 2 GLPI plugin for MMC agent Package: python3-mmc-dyngroup Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database-dyngroup (= ${binary:Version}) -Description: Pulse 2 dyngroup plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database-dyngroup (= ${binary:Version}) +Description: Medulla 2 dyngroup plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the dynamic computer group plugin for the MMC agent. It @@ -206,9 +219,9 @@ Description: Pulse 2 dyngroup plugin for MMC agent Package: python3-mmc-pkgs Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-msc (= ${binary:Version}), python3-requests (>= 0.12.1), python3-unidecode, python3-magic -Description: Pulse 2 pkgs plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-msc (= ${binary:Version}), python3-requests (>= 0.12.1), python3-unidecode, python3-magic +Description: Medulla 2 pkgs plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the pkgs plugin for the MMC agent. @@ -216,9 +229,9 @@ Description: Pulse 2 pkgs plugin for MMC agent Package: python3-mmc-imaging Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database-imaging (= ${binary:Version}) -Description: Pulse 2 imaging plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database-imaging (= ${binary:Version}) +Description: Medulla 2 imaging plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the imaging plugin for MMC agent. @@ -227,21 +240,21 @@ Package: python3-mmc-backuppc Architecture: all Section: python Pre-Depends: backuppc -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database-backuppc (= ${binary:Version}), python3-pyquery -Description: Pulse 2 BackupPC plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database-backuppc (= ${binary:Version}), python3-pyquery +Description: Medulla 2 BackupPC plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the BackupPC plugin for MMC agent. Package: python3-mmc-urbackup -Replaces: python3-pulse2-common-database-urbackup +Replaces: python3-medulla-common-database-urbackup Architecture: all Section: python Pre-Depends: urbackup-server -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1) -Description: Pulse 2 Urbackup plugin for MMC agent - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1) +Description: Medulla 2 Urbackup plugin for MMC agent + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the Urbackup plugin for MMC agent. @@ -249,40 +262,40 @@ Description: Pulse 2 Urbackup plugin for MMC agent Package: python3-mmc-support Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), autossh (>=1.4) -Description: Pulse 2 support plugin (provide remote access) - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), autossh (>=1.4) +Description: Medulla 2 support plugin (provide remote access) + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the support plugin to provide remote access - to the Pulse server for support purpose. + to the Medulla server for support purpose. Package: python3-mmc-admin Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common-database-admin (= ${binary:Version}) -Description: Pulse 2 support plugin (admin access) - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common-database-admin (= ${binary:Version}) +Description: Medulla 2 support plugin (admin access) + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the support plugin to provide admin access - to the Pulse server for support purpose. + to the Medulla server for support purpose. -Package: pulse2-package-server +Package: medulla-package-server Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-pulse2-common (= ${binary:Version}), genisoimage, python3-mmc-base (>= 3.1.1-1), python3-openssl, binutils | binutils-multiarch -Description: Pulse 2 package server - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-medulla-common (= ${binary:Version}), genisoimage, python3-mmc-base (>= 3.1.1-1), python3-openssl, binutils | binutils-multiarch +Description: Medulla 2 package server + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains the Pulse 2 package server. The package server manages + This package contains the Medulla 2 package server. The package server manages the packages and the images repository. Package: mmc-web-dyngroup Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 dynamic computer group plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 dynamic computer group plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the dynamic computer group plugin for the MMC web @@ -291,9 +304,9 @@ Description: Pulse 2 dynamic computer group plugin for MMC web interface Package: mmc-web-glpi Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 GLPI computer group plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 GLPI computer group plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the GLPI plugin for the MMC web interface. It @@ -301,18 +314,18 @@ Description: Pulse 2 GLPI computer group plugin for MMC web interface Package: mmc-web-inventory Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 inventory plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 inventory plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the inventory plugin for the MMC web interface. Package: mmc-web-msc Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 MSC plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 MSC plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the MSC plugin for the @@ -321,133 +334,133 @@ Description: Pulse 2 MSC plugin for MMC web interface Package: mmc-web-pkgs Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 package management plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 package management plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the package management plugin for the MMC web interface. -Package: mmc-web-pulse2 +Package: mmc-web-medulla Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1), mmc-web-imaging -Description: Pulse 2 base plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1), mmc-web-imaging +Description: Medulla 2 base plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the base plugin for the MMC web interface. Package: mmc-web-imaging Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1), php-xml -Description: Pulse 2 imaging plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1), php-xml +Description: Medulla 2 imaging plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the imaging plugin for the MMC web interface. Package: mmc-web-backuppc Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 BackupPC plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 BackupPC plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the BackupPC plugin for the MMC web interface. Package: mmc-web-urbackup Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 Urbackup plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 Urbackup plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the Urbackup plugin for the MMC web interface. Package: mmc-web-monitoring Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 monitoring plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 monitoring plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the monitoring plugin for the MMC web interface. Package: mmc-web-support Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 support plugin (provide remote access) - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 support plugin (provide remote access) + Medulla 2 is Open Source computer system management for medium and large organizations. . This package contains the support plugin to provide remote access - to the Pulse server for support purpose. + to the Medulla server for support purpose. -Package: pulse2-uuid-resolver +Package: medulla-uuid-resolver Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python3-twisted (>= 2.4.0) -Description: Pulse 2 UUID resolver - Pulse 2 is Open Source computer system management for medium and large +Description: Medulla 2 UUID resolver + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package contains a helper to resolve Pulse's UUID into IP address. + This package contains a helper to resolve Medulla's UUID into IP address. -Package: pulse2-register-pxe +Package: medulla-register-pxe Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python3-pulse2-common (= ${binary:Version}), python3-pyinotify, python3-magic -Description: Pulse 2 Register PXE Service - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, python3-medulla-common (= ${binary:Version}), python3-pyinotify, python3-magic +Description: Medulla 2 Register PXE Service + Medulla 2 is Open Source computer system management for medium and large organizations. Package: python3-mmc-xmppmaster Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-mmc-msc (= ${binary:Version}), python3-mmc-inventory (= ${binary:Version}) | python3-mmc-glpi (= ${binary:Version}), python3-mmc-dyngroup (= ${binary:Version}), python3-mmc-pkgs (= ${binary:Version}), python3-mmc-kiosk (= ${binary:Version}), python3-mmc-updates (= ${binary:Version}), python3-pulse2-common (= ${binary:Version}), python3-sqlalchemy (>= 0.4), python3-slixmpp, python3-geoip, python3-dnspython, geoip-database-contrib, python3-croniter -Description: Pulse 2 MMC agent plugins - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-mmc-msc (= ${binary:Version}), python3-mmc-inventory (= ${binary:Version}) | python3-mmc-glpi (= ${binary:Version}), python3-mmc-dyngroup (= ${binary:Version}), python3-mmc-pkgs (= ${binary:Version}), python3-mmc-kiosk (= ${binary:Version}), python3-mmc-updates (= ${binary:Version}), python3-medulla-common (= ${binary:Version}), python3-sqlalchemy (>= 0.4), python3-slixmpp, python3-geoip, python3-dnspython, geoip-database-contrib, python3-croniter +Description: Medulla 2 MMC agent plugins + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins. + This package will install all the Medulla 2 MMC agent interface plugins. Package: mmc-web-guacamole Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 GLPI computer group plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 GLPI computer group plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins + This package will install all the Medulla 2 MMC agent interface plugins Package: python3-mmc-guacamole Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-mmc-msc (= ${binary:Version}), python3-mmc-inventory (= ${binary:Version}) | python3-mmc-glpi (= ${binary:Version}), python3-mmc-dyngroup (= ${binary:Version}), python3-mmc-pkgs (= ${binary:Version}), python3-pulse2-common (= ${binary:Version}), python3-sqlalchemy (>= 0.4) -Description: Pulse 2 MMC agent plugins - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1), python3-mmc-msc (= ${binary:Version}), python3-mmc-inventory (= ${binary:Version}) | python3-mmc-glpi (= ${binary:Version}), python3-mmc-dyngroup (= ${binary:Version}), python3-mmc-pkgs (= ${binary:Version}), python3-medulla-common (= ${binary:Version}), python3-sqlalchemy (>= 0.4) +Description: Medulla 2 MMC agent plugins + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins. + This package will install all the Medulla 2 MMC agent interface plugins. Package: mmc-web-kiosk Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 GLPI computer group plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 GLPI computer group plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins + This package will install all the Medulla 2 MMC agent interface plugins Package: python3-mmc-kiosk Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1) -Description: Pulse 2 MMC agent plugins - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1) +Description: Medulla 2 MMC agent plugins + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins. + This package will install all the Medulla 2 MMC agent interface plugins. Package: python3-mmc-core Architecture: all @@ -552,19 +565,19 @@ Description: Xmpp mmc module Package: mmc-web-updates Architecture: all -Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) -Description: Pulse 2 OS Updates plugin for MMC web interface - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, medulla-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1) +Description: Medulla 2 OS Updates plugin for MMC web interface + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins + This package will install all the Medulla 2 MMC agent interface plugins Package: python3-mmc-updates Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1) -Description: Pulse 2 MMC agent plugins - Pulse 2 is Open Source computer system management for medium and large +Depends: ${misc:Depends}, ${python:Depends}, medulla-common(= ${binary:Version}), python3-mmc-base (>= 3.1.1-1) +Description: Medulla 2 MMC agent plugins + Medulla 2 is Open Source computer system management for medium and large organizations. . - This package will install all the Pulse 2 MMC agent interface plugins. + This package will install all the Medulla 2 MMC agent interface plugins. diff --git a/debian/copyright b/debian/copyright index 16a20b94fa..2d2cf73ea1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ This work was packaged for Debian by: It was downloaded from: - http://pulse2.mandriva.org + http://medulla.mandriva.org Upstream Author: diff --git a/debian/pulse2-common.docs b/debian/medulla-common.docs similarity index 100% rename from debian/pulse2-common.docs rename to debian/medulla-common.docs diff --git a/debian/medulla-common.install b/debian/medulla-common.install new file mode 100644 index 0000000000..151787f1e0 --- /dev/null +++ b/debian/medulla-common.install @@ -0,0 +1,49 @@ +usr/share/doc/medulla/Medulla-User-Manual-EN.pdf +usr/share/doc/medulla/contrib/samba +usr/share/doc/medulla/contrib/test-xmlrpc.examples +usr/share/doc/medulla/contrib/test-xmlrpc.php +usr/share/doc/medulla/contrib/test-xmlrpc.py +usr/share/doc/medulla/contrib/update +usr/share/doc/medulla/dev +usr/share/doc/medulla/examples +usr/share/doc/medulla/install +usr/share/doc/medulla/contrib/monit/medulla +usr/share/mmc/conf/apache/medulla.conf +etc/apache2/conf-available/medulla.conf +usr/share/doc/medulla/contrib/xmppmaster +usr/share/doc/medulla/contrib/package-server +usr/share/doc/medulla/contrib/msc +usr/share/doc/medulla/contrib/test-xmlrpc.php +usr/share/doc/medulla/contrib/test-xmlrpc.examples +usr/share/doc/medulla/contrib/test-xmlrpc.py +usr/share/doc/medulla/contrib/backuppc +usr/share/doc/medulla/contrib/urbackup +usr/share/doc/medulla/contrib/update +usr/share/doc/medulla/contrib/imaging-server +usr/share/doc/medulla/contrib/dyngroup +usr/share/doc/medulla/contrib/kiosk +usr/share/doc/medulla/contrib/package-server +usr/share/doc/medulla/contrib/msc +usr/share/doc/medulla/contrib/imaging +usr/share/doc/medulla/contrib/inventory +usr/share/doc/medulla/contrib/medulla +usr/share/doc/medulla/contrib/pkgs +usr/share/doc/medulla/contrib/updates +usr/share/doc/medulla/contrib/monit/medulla +usr/sbin/medulla-setup +usr/sbin/medulla-create-group +usr/sbin/medulla-load-defaults +usr/sbin/medulla-create-group +usr/sbin/restart-medulla-services +usr/sbin/medulla-debug +usr/sbin/medulla-dbupdate +usr/sbin/medulla-collect-info +usr/sbin/medulla-packageparser.py +usr/sbin/medulla-inscription_packages_in_base.py +usr/sbin/medulla-generation_package.py +usr/sbin/medulla-migration_old_package.py +usr/sbin/medulla-generate-update-package.py +usr/sbin/medulla-mariadb-move-update-package.py +usr/sbin/medulla_mysql_exec_update.sh +usr/sbin/medulla_mysql_exec_uninstall_unnecessary_update_package.sh +var/lib/medulla/file-transfer diff --git a/debian/medulla-inventory-server.default b/debian/medulla-inventory-server.default new file mode 100644 index 0000000000..027e4f6605 --- /dev/null +++ b/debian/medulla-inventory-server.default @@ -0,0 +1,9 @@ +# Defaults for medulla-inventory-server initscript +# sourced by /etc/init.d/medulla-inventory-server +# installed at /etc/default/medulla-inventory-server by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +ENABLE=no diff --git a/debian/medulla-inventory-server.install b/debian/medulla-inventory-server.install new file mode 100644 index 0000000000..d2cf6e2975 --- /dev/null +++ b/debian/medulla-inventory-server.install @@ -0,0 +1,4 @@ +usr/sbin/medulla-inventory-server +usr/share/man/man1/medulla-inventory-server.1 +usr/lib/python3/*-packages/medulla/inventoryserver +etc/mmc/medulla/inventory-server diff --git a/debian/medulla-package-server.default b/debian/medulla-package-server.default new file mode 100644 index 0000000000..ad7e5f704d --- /dev/null +++ b/debian/medulla-package-server.default @@ -0,0 +1,9 @@ +# Defaults for medulla-package-server initscript +# sourced by /etc/init.d/medulla-package-server +# installed at /etc/default/medulla-package-server by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +ENABLE=no diff --git a/debian/medulla-package-server.dirs b/debian/medulla-package-server.dirs new file mode 100644 index 0000000000..68f4d52f95 --- /dev/null +++ b/debian/medulla-package-server.dirs @@ -0,0 +1 @@ +var/lib/medulla/packages diff --git a/debian/medulla-package-server.install b/debian/medulla-package-server.install new file mode 100644 index 0000000000..d4f9fe9e81 --- /dev/null +++ b/debian/medulla-package-server.install @@ -0,0 +1,10 @@ +usr/sbin/medulla-package-server +usr/sbin/medulla-package-server-register-imaging +usr/sbin/message-sender.py +usr/lib/python3/*-packages/medulla/package_server +etc/mmc/medulla/package-server +etc/mmc/medulla/atftpd/pcre.conf +var/lib/medulla/imaging +usr/share/man/man1/medulla-package-server.1 +usr/share/man/man1/medulla-package-server-register-imaging.1 +usr/lib/systemd/system/medulla-package-server.service diff --git a/debian/medulla-package-server.postinst b/debian/medulla-package-server.postinst new file mode 100644 index 0000000000..b018d99012 --- /dev/null +++ b/debian/medulla-package-server.postinst @@ -0,0 +1,15 @@ +#!/bin/sh +set -e + +if [ ! -d "/var/lib/medulla/imaging/inventories" ]; then + mkdir -p /var/lib/medulla/imaging/inventories +fi + +chmod -Rv 777 /var/lib/medulla/imaging/inventories + + +systemctl daemon-reload + +#DEBHELPER# + +exit 0 diff --git a/debian/medulla-register-pxe.install b/debian/medulla-register-pxe.install new file mode 100644 index 0000000000..12f9628177 --- /dev/null +++ b/debian/medulla-register-pxe.install @@ -0,0 +1,2 @@ +usr/sbin/medulla-register-pxe.py +usr/lib/systemd/system/medulla-register-pxe.service diff --git a/debian/medulla-scheduler.default b/debian/medulla-scheduler.default new file mode 100644 index 0000000000..e8cf4c41dc --- /dev/null +++ b/debian/medulla-scheduler.default @@ -0,0 +1,9 @@ +# Defaults for medulla-scheduler initscript +# sourced by /etc/init.d/medulla-scheduler +# installed at /etc/default/medulla-scheduler by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +ENABLE=no diff --git a/debian/medulla-scheduler.postinst b/debian/medulla-scheduler.postinst new file mode 100644 index 0000000000..a08bb90a3a --- /dev/null +++ b/debian/medulla-scheduler.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ ! -d "/var/lib/medulla/imaging/inventories" ]; then + mkdir -p /var/lib/medulla/imaging/inventories +fi + +chmod -Rv 777 /var/lib/medulla/imaging/inventories + +#DEBHELPER# + +exit 0 diff --git a/debian/pulse2-scheduler.prerm b/debian/medulla-scheduler.prerm similarity index 59% rename from debian/pulse2-scheduler.prerm rename to debian/medulla-scheduler.prerm index 250bf7c10d..51c19e1640 100755 --- a/debian/pulse2-scheduler.prerm +++ b/debian/medulla-scheduler.prerm @@ -2,15 +2,15 @@ set -e # Automatically added by dh_pysupport if which update-python-modules >/dev/null 2>&1; then - update-python-modules -c pulse2-scheduler.public + update-python-modules -c medulla-scheduler.public fi # End automatically added section # Automatically added by dh_installinit -if [ -x "/etc/init.d/pulse2-scheduler" ]; then +if [ -x "/etc/init.d/medulla-scheduler" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d pulse2-scheduler stop || true + invoke-rc.d medulla-scheduler stop || true else - /etc/init.d/pulse2-scheduler stop || true + /etc/init.d/medulla-scheduler stop || true fi fi # End automatically added section diff --git a/debian/medulla-tests.install b/debian/medulla-tests.install new file mode 100644 index 0000000000..7559aaf46b --- /dev/null +++ b/debian/medulla-tests.install @@ -0,0 +1 @@ +usr/lib/python3/dist-packages/medulla/tests diff --git a/debian/medulla-uuid-resolver.install b/debian/medulla-uuid-resolver.install new file mode 100644 index 0000000000..9c10a2b87e --- /dev/null +++ b/debian/medulla-uuid-resolver.install @@ -0,0 +1,3 @@ +usr/bin/medulla-uuid-resolver +usr/bin/medulla-backup-handler +etc/mmc/medulla/uuid-resolver/uuid-resolver.ini diff --git a/debian/medulla.links b/debian/medulla.links new file mode 100644 index 0000000000..557ceac268 --- /dev/null +++ b/debian/medulla.links @@ -0,0 +1 @@ +usr/share/doc/medulla-common usr/share/doc/medulla diff --git a/debian/pulse2.postinst b/debian/medulla.postinst similarity index 100% rename from debian/pulse2.postinst rename to debian/medulla.postinst diff --git a/debian/mmc-agent.install b/debian/mmc-agent.install index 14faf93001..32260fb6d1 100644 --- a/debian/mmc-agent.install +++ b/debian/mmc-agent.install @@ -9,5 +9,5 @@ usr/share/man/man1/mmc-add-schema* usr/share/man/man1/mmc-agent* usr/share/man/man1/mmc-stats* usr/share/man/man1/mmc-helper* -usr/share/doc/pulse2/contrib/monit/mmc-agent +usr/share/doc/medulla/contrib/monit/mmc-agent usr/lib/systemd/system/mmc-agent.service diff --git a/debian/mmc-web-imaging.install b/debian/mmc-web-imaging.install index 84192f190a..8904fdad53 100644 --- a/debian/mmc-web-imaging.install +++ b/debian/mmc-web-imaging.install @@ -1,2 +1,2 @@ usr/share/mmc/modules/imaging -usr/bin/pulse2-synch-masters +usr/bin/medulla-synch-masters diff --git a/debian/mmc-web-pulse2.install b/debian/mmc-web-medulla.install similarity index 100% rename from debian/mmc-web-pulse2.install rename to debian/mmc-web-medulla.install diff --git a/debian/pulse2-common.install b/debian/pulse2-common.install index 07531208d2..47b3f5e156 100644 --- a/debian/pulse2-common.install +++ b/debian/pulse2-common.install @@ -1,49 +1 @@ -usr/share/doc/medulla/Pulse2-User-Manual-EN.pdf -usr/share/doc/pulse2/contrib/samba -usr/share/doc/pulse2/contrib/test-xmlrpc.examples -usr/share/doc/pulse2/contrib/test-xmlrpc.php -usr/share/doc/pulse2/contrib/test-xmlrpc.py -usr/share/doc/pulse2/contrib/update -usr/share/doc/medulla/dev -usr/share/doc/medulla/examples -usr/share/doc/medulla/install -usr/share/doc/pulse2/contrib/monit/pulse2 -usr/share/mmc/conf/apache/pulse.conf -etc/apache2/conf-available/pulse.conf -usr/share/doc/pulse2/contrib/xmppmaster -usr/share/doc/pulse2/contrib/package-server -usr/share/doc/pulse2/contrib/msc -usr/share/doc/pulse2/contrib/test-xmlrpc.php -usr/share/doc/pulse2/contrib/test-xmlrpc.examples -usr/share/doc/pulse2/contrib/test-xmlrpc.py -usr/share/doc/pulse2/contrib/backuppc -usr/share/doc/pulse2/contrib/urbackup -usr/share/doc/pulse2/contrib/update -usr/share/doc/pulse2/contrib/imaging-server -usr/share/doc/pulse2/contrib/dyngroup -usr/share/doc/pulse2/contrib/kiosk -usr/share/doc/pulse2/contrib/package-server -usr/share/doc/pulse2/contrib/msc -usr/share/doc/pulse2/contrib/imaging -usr/share/doc/pulse2/contrib/inventory -usr/share/doc/pulse2/contrib/pulse2 -usr/share/doc/pulse2/contrib/pkgs -usr/share/doc/pulse2/contrib/updates -usr/share/doc/pulse2/contrib/monit/pulse2 -usr/sbin/pulse2-setup -usr/sbin/pulse2-create-group -usr/sbin/pulse2-load-defaults -usr/sbin/pulse2-create-group -usr/sbin/restart-pulse-services -usr/sbin/pulse2-debug -usr/sbin/pulse2-dbupdate -usr/sbin/pulse2-collect-info -usr/sbin/pulse2-packageparser.py -usr/sbin/pulse2-inscription_packages_in_base.py -usr/sbin/pulse2-generation_package.py -usr/sbin/pulse2-migration_old_package.py -usr/sbin/medulla-generate-update-package.py -usr/sbin/medulla-mariadb-move-update-package.py -usr/sbin/medulla_mysql_exec_update.sh -usr/sbin/medulla_mysql_exec_uninstall_unnecessary_update_package.sh -var/lib/pulse2/file-transfer +#EMPTY diff --git a/debian/pulse2-inventory-server.default b/debian/pulse2-inventory-server.default deleted file mode 100644 index 60565f39f1..0000000000 --- a/debian/pulse2-inventory-server.default +++ /dev/null @@ -1,9 +0,0 @@ -# Defaults for pulse2-inventory-server initscript -# sourced by /etc/init.d/pulse2-inventory-server -# installed at /etc/default/pulse2-inventory-server by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -ENABLE=no diff --git a/debian/pulse2-inventory-server.install b/debian/pulse2-inventory-server.install deleted file mode 100644 index edd1adeab6..0000000000 --- a/debian/pulse2-inventory-server.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/sbin/pulse2-inventory-server -usr/share/man/man1/pulse2-inventory-server.1 -usr/lib/python3/*-packages/pulse2/inventoryserver -etc/mmc/pulse2/inventory-server diff --git a/debian/pulse2-package-server.default b/debian/pulse2-package-server.default deleted file mode 100644 index 02b1260f47..0000000000 --- a/debian/pulse2-package-server.default +++ /dev/null @@ -1,9 +0,0 @@ -# Defaults for pulse2-package-server initscript -# sourced by /etc/init.d/pulse2-package-server -# installed at /etc/default/pulse2-package-server by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -ENABLE=no diff --git a/debian/pulse2-package-server.dirs b/debian/pulse2-package-server.dirs deleted file mode 100644 index 6160b9632d..0000000000 --- a/debian/pulse2-package-server.dirs +++ /dev/null @@ -1 +0,0 @@ -var/lib/pulse2/packages diff --git a/debian/pulse2-package-server.install b/debian/pulse2-package-server.install deleted file mode 100644 index 8749744a5d..0000000000 --- a/debian/pulse2-package-server.install +++ /dev/null @@ -1,10 +0,0 @@ -usr/sbin/pulse2-package-server -usr/sbin/pulse2-package-server-register-imaging -usr/sbin/message-sender.py -usr/lib/python3/*-packages/pulse2/package_server -etc/mmc/pulse2/package-server -etc/mmc/pulse2/atftpd/pcre.conf -var/lib/pulse2/imaging -usr/share/man/man1/pulse2-package-server.1 -usr/share/man/man1/pulse2-package-server-register-imaging.1 -usr/lib/systemd/system/pulse2-package-server.service diff --git a/debian/pulse2-package-server.postinst b/debian/pulse2-package-server.postinst deleted file mode 100644 index 6b6d3bfa18..0000000000 --- a/debian/pulse2-package-server.postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -e - -if [ ! -d "/var/lib/pulse2/imaging/inventories" ]; then - mkdir -p /var/lib/pulse2/imaging/inventories -fi - -chmod -Rv 777 /var/lib/pulse2/imaging/inventories - - -systemctl daemon-reload - -#DEBHELPER# - -exit 0 diff --git a/debian/pulse2-register-pxe.install b/debian/pulse2-register-pxe.install deleted file mode 100644 index 0e67595b20..0000000000 --- a/debian/pulse2-register-pxe.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin/pulse2-register-pxe.py -usr/lib/systemd/system/pulse2-register-pxe.service diff --git a/debian/pulse2-scheduler.default b/debian/pulse2-scheduler.default deleted file mode 100644 index 110e9b976d..0000000000 --- a/debian/pulse2-scheduler.default +++ /dev/null @@ -1,9 +0,0 @@ -# Defaults for pulse2-scheduler initscript -# sourced by /etc/init.d/pulse2-scheduler -# installed at /etc/default/pulse2-scheduler by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -ENABLE=no diff --git a/debian/pulse2-scheduler.postinst b/debian/pulse2-scheduler.postinst deleted file mode 100644 index f574e86e0e..0000000000 --- a/debian/pulse2-scheduler.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -if [ ! -d "/var/lib/pulse2/imaging/inventories" ]; then - mkdir -p /var/lib/pulse2/imaging/inventories -fi - -chmod -Rv 777 /var/lib/pulse2/imaging/inventories - -#DEBHELPER# - -exit 0 diff --git a/debian/pulse2-tests.install b/debian/pulse2-tests.install deleted file mode 100644 index 53f6c07af0..0000000000 --- a/debian/pulse2-tests.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3/dist-packages/pulse2/tests diff --git a/debian/pulse2-uuid-resolver.install b/debian/pulse2-uuid-resolver.install deleted file mode 100644 index 0cd37b69a8..0000000000 --- a/debian/pulse2-uuid-resolver.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/pulse2-uuid-resolver -usr/bin/pulse2-backup-handler -etc/mmc/pulse2/uuid-resolver/uuid-resolver.ini diff --git a/debian/pulse2.links b/debian/pulse2.links deleted file mode 100644 index 15e1dbe5f6..0000000000 --- a/debian/pulse2.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/pulse2-common usr/share/doc/pulse2 diff --git a/debian/python3-medulla-common-database-admin.install b/debian/python3-medulla-common-database-admin.install new file mode 100644 index 0000000000..2518dc77b7 --- /dev/null +++ b/debian/python3-medulla-common-database-admin.install @@ -0,0 +1 @@ +/usr/lib/python3/*-packages/medulla/database/admin diff --git a/debian/python3-medulla-common-database-backuppc.install b/debian/python3-medulla-common-database-backuppc.install new file mode 100644 index 0000000000..7e1aec5379 --- /dev/null +++ b/debian/python3-medulla-common-database-backuppc.install @@ -0,0 +1 @@ +/usr/lib/python3/*-packages/medulla/database/backuppc diff --git a/debian/python3-medulla-common-database-dyngroup.install b/debian/python3-medulla-common-database-dyngroup.install new file mode 100644 index 0000000000..4b420bd17c --- /dev/null +++ b/debian/python3-medulla-common-database-dyngroup.install @@ -0,0 +1 @@ +/usr/lib/python3/*-packages/medulla/database/dyngroup diff --git a/debian/python3-medulla-common-database-imaging.install b/debian/python3-medulla-common-database-imaging.install new file mode 100644 index 0000000000..6a5cf81a66 --- /dev/null +++ b/debian/python3-medulla-common-database-imaging.install @@ -0,0 +1 @@ +/usr/lib/python3/*-packages/medulla/database/imaging diff --git a/debian/python3-medulla-common-database-inventory.install b/debian/python3-medulla-common-database-inventory.install new file mode 100644 index 0000000000..a213ed9052 --- /dev/null +++ b/debian/python3-medulla-common-database-inventory.install @@ -0,0 +1 @@ +/usr/lib/python3/*-packages/medulla/database/inventory diff --git a/debian/python3-medulla-common-database-msc.install b/debian/python3-medulla-common-database-msc.install new file mode 100644 index 0000000000..9b602560db --- /dev/null +++ b/debian/python3-medulla-common-database-msc.install @@ -0,0 +1 @@ +/usr/lib/python3/*-packages/medulla/database/msc diff --git a/debian/python3-medulla-common-database.install b/debian/python3-medulla-common-database.install new file mode 100644 index 0000000000..1c33c54fb9 --- /dev/null +++ b/debian/python3-medulla-common-database.install @@ -0,0 +1,2 @@ +/usr/lib/python3/*-packages/medulla/database/__init__.py +/usr/lib/python3/*-packages/medulla/database/medulla/ diff --git a/debian/python3-medulla-common.install b/debian/python3-medulla-common.install new file mode 100644 index 0000000000..fcba445ff2 --- /dev/null +++ b/debian/python3-medulla-common.install @@ -0,0 +1,4 @@ +/usr/lib/python3/*-packages/medulla/*.py +/usr/lib/python3/*-packages/medulla/managers +/usr/lib/python3/*-packages/medulla/apis +/usr/lib/python3/*-packages/medulla/imaging diff --git a/debian/python3-mmc-admin.install b/debian/python3-mmc-admin.install index da2c3e4d68..92d7315e9d 100644 --- a/debian/python3-mmc-admin.install +++ b/debian/python3-mmc-admin.install @@ -1,3 +1,3 @@ etc/mmc/plugins/admin.ini usr/lib/python3/*-packages/mmc/plugins/admin -usr/share/doc/pulse2/contrib/admin/ +usr/share/doc/medulla/contrib/admin/ diff --git a/debian/python3-mmc-backuppc.install b/debian/python3-mmc-backuppc.install index 123f8cba14..5c51ef33fd 100644 --- a/debian/python3-mmc-backuppc.install +++ b/debian/python3-mmc-backuppc.install @@ -1,6 +1,6 @@ usr/lib/python3/*-packages/mmc/plugins/backuppc etc/mmc/plugins/backuppc.ini -usr/sbin/pulse2-backup-servers -usr/sbin/pulse2-disconnect-machine-backuppc -usr/sbin/pulse2-connect-machine-backuppc -usr/share/doc/pulse2/contrib/backuppc +usr/sbin/medulla-backup-servers +usr/sbin/medulla-disconnect-machine-backuppc +usr/sbin/medulla-connect-machine-backuppc +usr/share/doc/medulla/contrib/backuppc diff --git a/debian/python3-mmc-base.install b/debian/python3-mmc-base.install index 7d0ba740c5..af619f7fe4 100644 --- a/debian/python3-mmc-base.install +++ b/debian/python3-mmc-base.install @@ -3,6 +3,6 @@ etc/mmc/plugins/base.ini usr/lib/mmc/backup-tools usr/lib/python3/*-packages/mmc/plugins/__init__.py usr/lib/python3/*-packages/mmc/site.py -usr/share/doc/pulse2/contrib/base -usr/share/doc/pulse2/contrib/scripts/usertoken-example -usr/share/doc/pulse2/contrib/scripts/mmc-check-users-primary-group +usr/share/doc/medulla/contrib/base +usr/share/doc/medulla/contrib/scripts/usertoken-example +usr/share/doc/medulla/contrib/scripts/mmc-check-users-primary-group diff --git a/debian/python3-mmc-core.install b/debian/python3-mmc-core.install index 1e64d4901c..186f3da4a4 100644 --- a/debian/python3-mmc-core.install +++ b/debian/python3-mmc-core.install @@ -3,4 +3,4 @@ usr/lib/python3/*-packages/mmc/core usr/lib/python3/*-packages/mmc/support usr/lib/python3/*-packages/mmc/ssl.py usr/lib/python3/*-packages/mmc/__init__.py -usr/share/doc/pulse2/contrib/audit +usr/share/doc/medulla/contrib/audit diff --git a/debian/python3-mmc-core.triggers b/debian/python3-mmc-core.triggers index cf6a92a931..c5d59c34a5 100644 --- a/debian/python3-mmc-core.triggers +++ b/debian/python3-mmc-core.triggers @@ -1,4 +1,4 @@ # Something changed in MMC's modules... interest /usr/share/pyshared/mmc -# Or Pulse2 stuff (imported by Pulse2 MMC's modules) -interest /usr/share/pyshared/pulse2 +# Or Medulla2 stuff (imported by Medulla2 MMC's modules) +interest /usr/share/pyshared/medulla diff --git a/debian/python3-mmc-glpi.install b/debian/python3-mmc-glpi.install index 7493aab152..6b6f51c4d3 100644 --- a/debian/python3-mmc-glpi.install +++ b/debian/python3-mmc-glpi.install @@ -1,5 +1,5 @@ usr/lib/python3/*-packages/mmc/plugins/glpi -usr/sbin/pulse2-extract-glpi-search-options +usr/sbin/medulla-extract-glpi-search-options etc/mmc/plugins/glpi.ini etc/mmc/plugins/glpi_search_options.ini -usr/share/doc/pulse2/contrib/glpi*.sql +usr/share/doc/medulla/contrib/glpi*.sql diff --git a/debian/python3-mmc-inventory.install b/debian/python3-mmc-inventory.install index 93dc3e05cd..4acb53d250 100644 --- a/debian/python3-mmc-inventory.install +++ b/debian/python3-mmc-inventory.install @@ -1,4 +1,4 @@ usr/lib/python3/*-packages/mmc/plugins/inventory etc/mmc/plugins/inventory.ini -usr/sbin/pulse2-inventory-clean-database -usr/share/man/man1/pulse2-inventory-clean-database.1 +usr/sbin/medulla-inventory-clean-database +usr/share/man/man1/medulla-inventory-clean-database.1 diff --git a/debian/python3-mmc-kiosk.install b/debian/python3-mmc-kiosk.install index 1df3ff1491..f820583be0 100644 --- a/debian/python3-mmc-kiosk.install +++ b/debian/python3-mmc-kiosk.install @@ -1,3 +1,3 @@ etc/mmc/plugins/kiosk.ini usr/lib/python3/*-packages/mmc/plugins/kiosk -usr/lib/python3/*-packages/pulse2/database/kiosk +usr/lib/python3/*-packages/medulla/database/kiosk diff --git a/debian/python3-mmc-pulse2.install b/debian/python3-mmc-medulla.install similarity index 100% rename from debian/python3-mmc-pulse2.install rename to debian/python3-mmc-medulla.install diff --git a/debian/python3-mmc-msc.install b/debian/python3-mmc-msc.install index 03ba24564d..4339255c14 100644 --- a/debian/python3-mmc-msc.install +++ b/debian/python3-mmc-msc.install @@ -1,6 +1,6 @@ usr/lib/python3/*-packages/mmc/plugins/msc etc/mmc/plugins/msc.ini -usr/sbin/pulse2-msc-clean-database -usr/share/man/man1/pulse2-msc-clean-database.1 -var/lib/pulse2/qactions +usr/sbin/medulla-msc-clean-database +usr/share/man/man1/medulla-msc-clean-database.1 +var/lib/medulla/qactions usr/share/doc/medulla/user/msc diff --git a/debian/python3-mmc-pkgs.install b/debian/python3-mmc-pkgs.install index a2a3709e90..77a276c9cc 100644 --- a/debian/python3-mmc-pkgs.install +++ b/debian/python3-mmc-pkgs.install @@ -1,3 +1,3 @@ -usr/lib/python3/*-packages/pulse2/database/pkgs +usr/lib/python3/*-packages/medulla/database/pkgs usr/lib/python3/*-packages/mmc/plugins/pkgs etc/mmc/plugins/pkgs.ini diff --git a/debian/python3-mmc-ppolicy.install b/debian/python3-mmc-ppolicy.install index c332f35119..b844de725c 100644 --- a/debian/python3-mmc-ppolicy.install +++ b/debian/python3-mmc-ppolicy.install @@ -1,5 +1,5 @@ usr/lib/python3/*-packages/mmc/plugins/ppolicy etc/mmc/plugins/ppolicy.ini -usr/share/doc/pulse2/contrib/ppolicy -usr/share/doc/pulse2/contrib/scripts/mmc-check-expired-passwords-example -usr/share/doc/pulse2/contrib/ppolicy +usr/share/doc/medulla/contrib/ppolicy +usr/share/doc/medulla/contrib/scripts/mmc-check-expired-passwords-example +usr/share/doc/medulla/contrib/ppolicy diff --git a/debian/python3-mmc-report.install b/debian/python3-mmc-report.install index e0c38f0ea9..8e48238fca 100644 --- a/debian/python3-mmc-report.install +++ b/debian/python3-mmc-report.install @@ -1,4 +1,4 @@ usr/lib/python3/*-packages/mmc/plugins/report etc/mmc/plugins/report.ini etc/mmc/plugins/report -usr/share/doc/pulse2/contrib/report +usr/share/doc/medulla/contrib/report diff --git a/debian/python3-mmc-updates.install b/debian/python3-mmc-updates.install index f36e75e8ad..0f66df5d62 100644 --- a/debian/python3-mmc-updates.install +++ b/debian/python3-mmc-updates.install @@ -1,3 +1,3 @@ etc/mmc/plugins/updates.ini usr/lib/python3/*-packages/mmc/plugins/updates -usr/lib/python3/*-packages/pulse2/database/updates +usr/lib/python3/*-packages/medulla/database/updates diff --git a/debian/python3-mmc-urbackup.install b/debian/python3-mmc-urbackup.install index f68af03f1c..2a45fe3277 100644 --- a/debian/python3-mmc-urbackup.install +++ b/debian/python3-mmc-urbackup.install @@ -1,3 +1,3 @@ usr/lib/python3/*-packages/mmc/plugins/urbackup etc/mmc/plugins/urbackup.ini -usr/lib/python3/*-packages/pulse2/database/urbackup +usr/lib/python3/*-packages/medulla/database/urbackup diff --git a/debian/python3-mmc-xmppmaster.install b/debian/python3-mmc-xmppmaster.install index 4613a551a7..df27bd9e92 100644 --- a/debian/python3-mmc-xmppmaster.install +++ b/debian/python3-mmc-xmppmaster.install @@ -12,4 +12,4 @@ etc/mmc/plugins/loadreconf.ini etc/mmc/plugins/wakeonlan.ini etc/mmc/plugins/wakeonlangroup.ini usr/lib/python3/*-packages/mmc/plugins/xmppmaster -usr/lib/python3/*-packages/pulse2/database/xmppmaster +usr/lib/python3/*-packages/medulla/database/xmppmaster diff --git a/debian/python3-mmc-xmppmaster.postinst b/debian/python3-mmc-xmppmaster.postinst index a7cfe2d429..493461a2a9 100644 --- a/debian/python3-mmc-xmppmaster.postinst +++ b/debian/python3-mmc-xmppmaster.postinst @@ -3,13 +3,13 @@ set -e case "$1" in configure) - if ! getent passwd | grep -q "^pulsetransfert:"; then - echo -n "Adding user pulsetransfert..." + if ! getent passwd | grep -q "^medullatransfert:"; then + echo -n "Adding user medullatransfert..." adduser --system --quiet \ - --home /var/lib/pulse2/file-transfer \ + --home /var/lib/medulla/file-transfer \ --shell /bin/rbash \ --disabled-password \ - pulsetransfert + medullatransfert echo "..done" fi ;; diff --git a/debian/python3-pulse2-common-database-admin.install b/debian/python3-pulse2-common-database-admin.install deleted file mode 100644 index 22001a8314..0000000000 --- a/debian/python3-pulse2-common-database-admin.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/admin diff --git a/debian/python3-pulse2-common-database-backuppc.install b/debian/python3-pulse2-common-database-backuppc.install deleted file mode 100644 index fc9877da78..0000000000 --- a/debian/python3-pulse2-common-database-backuppc.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/backuppc diff --git a/debian/python3-pulse2-common-database-dyngroup.install b/debian/python3-pulse2-common-database-dyngroup.install deleted file mode 100644 index f1c6be21d0..0000000000 --- a/debian/python3-pulse2-common-database-dyngroup.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/dyngroup diff --git a/debian/python3-pulse2-common-database-imaging.install b/debian/python3-pulse2-common-database-imaging.install deleted file mode 100644 index 140d595f13..0000000000 --- a/debian/python3-pulse2-common-database-imaging.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/imaging diff --git a/debian/python3-pulse2-common-database-inventory.install b/debian/python3-pulse2-common-database-inventory.install deleted file mode 100644 index f492dbcfdf..0000000000 --- a/debian/python3-pulse2-common-database-inventory.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/inventory diff --git a/debian/python3-pulse2-common-database-msc.install b/debian/python3-pulse2-common-database-msc.install deleted file mode 100644 index e7b806b3a9..0000000000 --- a/debian/python3-pulse2-common-database-msc.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/msc diff --git a/debian/python3-pulse2-common-database.install b/debian/python3-pulse2-common-database.install deleted file mode 100644 index 66db99e3ca..0000000000 --- a/debian/python3-pulse2-common-database.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/database/__init__.py -/usr/lib/python3/*-packages/pulse2/database/pulse/ diff --git a/debian/python3-pulse2-common.install b/debian/python3-pulse2-common.install deleted file mode 100644 index 868440d951..0000000000 --- a/debian/python3-pulse2-common.install +++ /dev/null @@ -1,4 +0,0 @@ -/usr/lib/python3/*-packages/pulse2/*.py -/usr/lib/python3/*-packages/pulse2/managers -/usr/lib/python3/*-packages/pulse2/apis -/usr/lib/python3/*-packages/pulse2/imaging diff --git a/debian/rules b/debian/rules index 5682866d7b..0a7a4c0308 100755 --- a/debian/rules +++ b/debian/rules @@ -4,26 +4,26 @@ # # $Id: rules 7790 2010-12-02 14:21:28Z cdelfosse $ # -# This file is part of Pulse 2. +# This file is part of Medulla 2. # -# Pulse 2 is free software; you can redistribute it and/or modify +# Medulla 2 is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# Pulse 2 is distributed in the hope that it will be useful, +# Medulla 2 is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Pulse 2. If not, see . +# along with Medulla 2. If not, see . -# We'll symlink /usr/share/doc/ to the pulse2-common one +# We'll symlink /usr/share/doc/ to the medulla-common one # So we need a list of available packages -PKG_LIST = $(shell cat debian/control | grep Package | awk '{ print $$2 }' | grep -v '^pulse2-common$$' | grep -v '^pulse2$$' | grep -v '^pulse2-uuid-resolver$$' | grep -v '^pulse2-imaging-server$$' | tr "\n" " ") +PKG_LIST = $(shell cat debian/control | grep Package | awk '{ print $$2 }' | grep -v '^medulla-common$$' | grep -v '^medulla$$' | grep -v '^medulla-uuid-resolver$$' | grep -v '^medulla-imaging-server$$' | tr "\n" " ") -PACKAGE=pulse2 +PACKAGE=medulla DESTDIR=$(CURDIR)/debian/tmp # Define *FLAGS @@ -80,25 +80,25 @@ install: build rm -rf $(DESTDIR)/etc/init.d mkdir -p $(DESTDIR)/usr/lib/systemd/system cp $(CURDIR)/services/systemd/*.service $(DESTDIR)/usr/lib/systemd/system - rm -fv $(DESTDIR)/usr/lib/systemd/system/pulse2-scheduler.service + rm -fv $(DESTDIR)/usr/lib/systemd/system/medulla-scheduler.service # Autotools won't listen to me... - rm -f $(DESTDIR)/var/lib/pulse2/clients/win32/generate-agent-pack.sh.in + rm -f $(DESTDIR)/var/lib/medulla/clients/win32/generate-agent-pack.sh.in # Useless files - rm -f $(DESTDIR)/usr/share/doc/pulse2/README.win32 + rm -f $(DESTDIR)/usr/share/doc/medulla/README.win32 rm -f $(DESTDIR)/usr/share/mmc/modules/inventory/includes/libchart/doc/DEJAVU_LICENSE mkdir -p $(DESTDIR)/etc/apache2/conf-available/ - cp $(CURDIR)/web/conf/apache/pulse.conf $(DESTDIR)/etc/apache2/conf-available/ - mkdir -p $(DESTDIR)/var/lib/pulse2/file-transfer + cp $(CURDIR)/web/conf/apache/medulla.conf $(DESTDIR)/etc/apache2/conf-available/ + mkdir -p $(DESTDIR)/var/lib/medulla/file-transfer #(workaround) Remove schema-018.sql - rm -fv $(DESTDIR)/usr/share/doc/pulse2/contrib/imaging/sql/schema-018.sql + rm -fv $(DESTDIR)/usr/share/doc/medulla/contrib/imaging/sql/schema-018.sql # Remove opencliparts files rm -frv $(DESTDIR)/usr/share/mmc/media/images/msc/opencliparts_0.18 cp $(DESTDIR)/etc/mmc/apache/mmc.conf $(DESTDIR)/etc/apache2/conf-available/ # Workaround install issue mkdir -p $(DESTDIR)/usr/lib/python3/dist-packages/ mv -f $(DESTDIR)/usr/local/lib/python3.11/dist-packages/* $(DESTDIR)/usr/lib/python3/dist-packages/ - # Manually copy custom SQL views into /usr/share/doc/pulse2/ - cp services/contrib/glpi-*.sql $(DESTDIR)/usr/share/doc/pulse2/contrib/ + # Manually copy custom SQL views into /usr/share/doc/medulla/ + cp services/contrib/glpi-*.sql $(DESTDIR)/usr/share/doc/medulla/contrib/ binary-indep: build install dh_testdir @@ -122,21 +122,21 @@ binary-indep: build install binary-arch: build install dh_installdirs # Must be readable by backuppc - chmod 0644 $(DESTDIR)/etc/mmc/pulse2/uuid-resolver/uuid-resolver.ini + chmod 0644 $(DESTDIR)/etc/mmc/medulla/uuid-resolver/uuid-resolver.ini # Must be writable by web-server dh_install --sourcedir=$(DESTDIR) --fail-missing # This directory must be writable for www-data (first run) chown www-data:root debian/python3-mmc-support/etc/mmc/plugins/support chmod 750 debian/python3-mmc-support/etc/mmc/plugins/support dh_fixperms -Xetc/mmc \ - -Xusr/share/doc/pulse2/contrib/ \ + -Xusr/share/doc/medulla/contrib/ \ -Xvar/log/mmc - dh_installchangelogs -Npulse2 ChangeLog - dh_installdocs -Npulse2 - find debian/pulse2-common/usr/share/doc/pulse2/contrib/ -path '*/imaging/lrsgznbd/*' -prune -o -name 'Makefile*' -exec rm {} \; + dh_installchangelogs -Nmedulla ChangeLog + dh_installdocs -Nmedulla + find debian/medulla-common/usr/share/doc/medulla/contrib/ -path '*/imaging/lrsgznbd/*' -prune -o -name 'Makefile*' -exec rm {} \; for PKG in $(PKG_LIST); do \ rm -r debian/$$PKG/usr/share/doc/$$PKG; \ - ln -sf pulse2 debian/$$PKG/usr/share/doc/$$PKG; \ + ln -sf medulla debian/$$PKG/usr/share/doc/$$PKG; \ done dh_shlibdeps diff --git a/debian/watch b/debian/watch index bf072dba97..d6e2341c35 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://pulse2.mandriva.org/pub/pulse2/server/sources/pulse2-(.*).tar.gz +http://medulla.mandriva.org/pub/medulla/server/sources/medulla-(.*).tar.gz diff --git a/doc/Makefile.am b/doc/Makefile.am index 489516bab5..918d7a840a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ # # $Id$ # -# This file is part of Mandriva Pulse2 project. +# This file is part of Mandriva Medulla2 project. # # This software is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,12 +30,12 @@ docsrc = \ dev/inventory/en/database_documentation.xml \ dev/msc/en/database_documentation.xml \ dev/dyngroup/en/database_documentation.xml \ - user/msc/en/pulse2_client_check_explained.xml \ - user/msc/en/pulse2_deployment_error_codes_explained.xml \ - user/msc/fr/pulse2_deployment_error_codes_explained.xml \ + user/msc/en/medulla_client_check_explained.xml \ + user/msc/en/medulla_deployment_error_codes_explained.xml \ + user/msc/fr/medulla_deployment_error_codes_explained.xml \ install/pki/create-pki.README \ install/pki/create-pki.sh \ - install/pki/pulse.cnf.in + install/pki/medulla.cnf.in docpng = \ diff --git a/doc/dev/dyngroup/en/database_documentation.xml b/doc/dev/dyngroup/en/database_documentation.xml index 85288ccf2d..71f575ca5b 100644 --- a/doc/dev/dyngroup/en/database_documentation.xml +++ b/doc/dev/dyngroup/en/database_documentation.xml @@ -42,7 +42,7 @@
The dyngroup database design - In Pulse2 a group is a way to launch an action on several machines at the same time, it contains machines and has a name. A group is associated to an user, this user can share the group with others users if wanted. + In Medulla2 a group is a way to launch an action on several machines at the same time, it contains machines and has a name. A group is associated to an user, this user can share the group with others users if wanted. There are 3 kinds of groups: @@ -81,7 +81,7 @@ uuid - The machine's UUID, used by Pulse2 to handle a machine. + The machine's UUID, used by Medulla2 to handle a machine. diff --git a/doc/dev/imaging/en/client_content.xml b/doc/dev/imaging/en/client_content.xml index bbfa6cba50..96cc6636d8 100644 --- a/doc/dev/imaging/en/client_content.xml +++ b/doc/dev/imaging/en/client_content.xml @@ -2,7 +2,7 @@
- Pulse 2 client content + Medulla 2 client content Nicolas @@ -29,13 +29,13 @@ - Description of a Pulse 2 client folder + Description of a Medulla 2 client folder $Id: database_documentation.xml 4145 2009-05-12 16:29:28Z nrueff $
Overall organization - A Pulse 2 client folder contains information of two kind : + A Medulla 2 client folder contains information of two kind : @@ -52,7 +52,7 @@
exclude - The Pulse 2 backup binaries use this file to learn which partitions to backup (more precisely, which to exclude). This one contains exclusion patterns, one per line, using the following syntax : <disk name>:<partition name> : + The Medulla 2 backup binaries use this file to learn which partitions to backup (more precisely, which to exclude). This one contains exclusion patterns, one per line, using the following syntax : <disk name>:<partition name> : To prevent backuping the P partition from D disk : D:P diff --git a/doc/dev/imaging/en/image_content.xml b/doc/dev/imaging/en/image_content.xml index 79aac997fa..a2803b4d2e 100644 --- a/doc/dev/imaging/en/image_content.xml +++ b/doc/dev/imaging/en/image_content.xml @@ -2,7 +2,7 @@
- Pulse 2 image content + Medulla 2 image content Nicolas @@ -29,13 +29,13 @@ - Description of a Pulse 2 image folder + Description of a Medulla 2 image folder $Id: database_documentation.xml 4145 2009-05-12 16:29:28Z nrueff $
Overall organization - A Pulse 2 image is contained in a folder, with files containing information, and files containing meta-information. + A Medulla 2 image is contained in a folder, with files containing information, and files containing meta-information.
Files containing information diff --git a/doc/dev/imaging/en/workflow.xml b/doc/dev/imaging/en/workflow.xml index 59de0ead07..bf15ffa044 100644 --- a/doc/dev/imaging/en/workflow.xml +++ b/doc/dev/imaging/en/workflow.xml @@ -2,7 +2,7 @@
- Pulse 2 image content + Medulla 2 image content Nicolas @@ -29,13 +29,13 @@ - Description of a Pulse 2 image + Description of a Medulla 2 image $Id: database_documentation.xml 4145 2009-05-12 16:29:28Z nrueff $
Overall organization - A Pulse 2 image is contained in a folder, with files containing information, and files containing meta-information. + A Medulla 2 image is contained in a folder, with files containing information, and files containing meta-information.
Files containing information @@ -119,7 +119,7 @@ desc <the image description>
exclude - The Pulse 2 backup binaries uses this file to learn which partitions to backup (more precisely, which to exclude). This one contains exclusion patterns, one per line, using the following syntax : <disk name>:<partition name> : + The Medulla 2 backup binaries uses this file to learn which partitions to backup (more precisely, which to exclude). This one contains exclusion patterns, one per line, using the following syntax : <disk name>:<partition name> : To prevent backuping the P partition from D disk : D:P diff --git a/doc/dev/inventory/en/database_documentation.xml b/doc/dev/inventory/en/database_documentation.xml index 803dac6f30..1e29e7b7fc 100644 --- a/doc/dev/inventory/en/database_documentation.xml +++ b/doc/dev/inventory/en/database_documentation.xml @@ -43,7 +43,7 @@
The inventory database design - The inventory database holds data on the computers managed by Pulse 2, namely their hardware (available storage, memory, connected printers/modems etc.) and software (installed software packages, registry keys etc.) configuration. + The inventory database holds data on the computers managed by Medulla 2, namely their hardware (available storage, memory, connected printers/modems etc.) and software (installed software packages, registry keys etc.) configuration. The inventory database has a number of hardware/software element tables, each describing a given computer part in detail, with fields specific to the part (e.g. the available space, in the Drive table). Every table is linked to the Inventory and Machine tables using a table dedicated to this linking feature. For example, the Modem table is linked to the Inventory and Machine tables using the hasModem table. diff --git a/doc/dev/msc/en/database_documentation.xml b/doc/dev/msc/en/database_documentation.xml index 930d23c9e0..460389af22 100644 --- a/doc/dev/msc/en/database_documentation.xml +++ b/doc/dev/msc/en/database_documentation.xml @@ -29,7 +29,7 @@ - Documentation for Pulse2 MSC schema. + Documentation for Medulla2 MSC schema. $Id$ diff --git a/doc/doc.mk b/doc/doc.mk index 65524fdcc7..632a5b8683 100644 --- a/doc/doc.mk +++ b/doc/doc.mk @@ -2,7 +2,7 @@ # # $Id$ # -# This file is part of Mandriva Pulse2 project. +# This file is part of Mandriva Medulla2 project. # # This software is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -50,6 +50,6 @@ DocumentConverter.py: tar: $(MAKE) distdir distdir=build - cd build && tar czf ../pulse2-doc.tar.gz . + cd build && tar czf ../medulla-doc.tar.gz . .PHONY: start_lo kill_lo diff --git a/doc/docbook-xhtml.xsl b/doc/docbook-xhtml.xsl index ddc066521f..e43a32f6e5 100644 --- a/doc/docbook-xhtml.xsl +++ b/doc/docbook-xhtml.xsl @@ -39,7 +39,7 @@ -setSideMenu($sidemenu); - $p->display(); - echo '
'; +setSideMenu($sidemenu); +$p->display(); +echo '
'; ?> diff --git a/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsing.php b/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsing.php index bc99c4d964..90510acabb 100644 --- a/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsing.php +++ b/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsing.php @@ -259,8 +259,8 @@ echo "


"; // creation repertoire namemachine si non existe. -// et recuperation pathcurent pour cette machine eg /var/lib/pulse2/transfertfiles -// /machine25pulse +// et recuperation pathcurent pour cette machine eg /var/lib/medulla/transfertfiles +// /machine25medulla $lifdirlocal = xmlrpc_localfilesystem(""); $filecurentdir = xmlrpc_create_local_dir_transfert($lifdirlocal['path_abs_current'], $ma['hostname']); $curentdir = $filecurentdir['path_abs_current']; diff --git a/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsingne.php b/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsingne.php index 1bc3a7cdcc..ffd7a5477b 100644 --- a/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsingne.php +++ b/web/modules/xmppmaster/xmppmaster/xmppfilesbrowsingne.php @@ -136,29 +136,28 @@ } -$value) - { - if(!in_array($key, ["module","submod", "action"])) - $get[$key] = $value; - } - header("Location: " . urlStrRedirect($url, $get)); +require("graph/navbar.inc.php"); +require_once("modules/xmppmaster/includes/xmlrpc.php"); + +if(isexpertmode()) { + $url = "xmppmaster/xmppmaster/xmppfilesbrowsing"; + $get = []; + foreach($_GET as $key => $value) { + if(!in_array($key, ["module","submod", "action"])) { + $get[$key] = $value; + } } + header("Location: " . urlStrRedirect($url, $get)); +} -$uuid = isset($_GET['objectUUID']) ? $_GET['objectUUID'] : ( isset($_POST['objectUUID']) ? $_POST['objectUUID'] : ""); -$jid = isset($_GET['jid']) ? $_GET['jid'] : ( isset($_POST['jid']) ? $_POST['jid'] : ""); -$machine = isset($_POST['Machine']) ? $_POST['Machine'] : ($uuid != '' ? xmlrpc_getjidMachinefromuuid( $uuid ) : $jid); +$uuid = isset($_GET['objectUUID']) ? $_GET['objectUUID'] : (isset($_POST['objectUUID']) ? $_POST['objectUUID'] : ""); +$jid = isset($_GET['jid']) ? $_GET['jid'] : (isset($_POST['jid']) ? $_POST['jid'] : ""); +$machine = isset($_POST['Machine']) ? $_POST['Machine'] : ($uuid != '' ? xmlrpc_getjidMachinefromuuid($uuid) : $jid); $ma = xmlrpc_getMachinefromjid($machine); -$tab = explode("/",$machine); +$tab = explode("/", $machine); $p = new PageGenerator(_T("File manager", 'xmppmaster')." on ". $ma['hostname']); $p->setSideMenu($sidemenu); $p->display(); @@ -170,7 +169,7 @@ echo "


"; // creation repertoire namemachine si non existe. // et recuperation pathcurent pour cette machine -// eg /var/lib/pulse2/transfertfiles/machine25pulse +// eg /var/lib/medulla/transfertfiles/machine25medulla $filecurentdir = xmlrpc_create_local_dir_transfert(xmlrpc_localfilesystem("")['path_abs_current'], $ma['hostname']); $curentdir = $filecurentdir['path_abs_current']; @@ -180,13 +179,11 @@ echo 'var seperator = "\\\\";'; echo 'var os = "win";'; -} -else{ +} else { echo 'var seperator = "/";'; - if (stristr($ma['platform'], "darwin")){ + if (stristr($ma['platform'], "darwin")) { echo 'var os = "darwin";'; - } - else{ + } else { echo 'var os = "linux";'; } } @@ -195,32 +192,32 @@ '; - echo "$msg"; - echo ""; - exit; +if ($rootfilesystem[1] == ":") { + $rootfilesystempath = substr($lifdir['data']['rootfilesystem'], 2); +} +if (isset($lifdir['err'])) { + if ($lifdir['err'] == 'Timeout Error') { + $msg = sprintf(_T("Sorry, the remote machine [%s] takes too much time to answer.", "xmppmaster"), $machine); + } else { + $msg = sprintf(_T("Error : %s", "xmppmaster"), $machine); } - $searchchar = array(':', '/', ); - $replacechar = array( '", "children" : [', '{"text" : "'); - $datatree = str_replace ( $searchchar, $replacechar, $lifdir['data']['strjsonhierarchy'] ); - unset ($lifdir['data']['strjsonhierarchy']); - //$datatree = $lifdir['data']['strjsonhierarchy']; + echo '

'; + echo "$msg"; + echo "

"; + exit; +} +$searchchar = array(':', '/', ); +$replacechar = array( '", "children" : [', '{"text" : "'); +$datatree = str_replace($searchchar, $replacechar, $lifdir['data']['strjsonhierarchy']); +unset($lifdir['data']['strjsonhierarchy']); +//$datatree = $lifdir['data']['strjsonhierarchy']; ?>
@@ -230,12 +227,12 @@
- ' ,$curentdir, $filecurentdir['parentdir']); - ?> + ', $curentdir, $filecurentdir['parentdir']); +?>

@@ -295,8 +292,8 @@ filenamelocal = ""; timetmp = ""; taillefile =""; - rootfilesystem = ""; // ""; - rootfilesystempath = ""; //""; + rootfilesystem = ""; // ""; + rootfilesystempath = ""; //""; jid = ""; user = ""; nameremotepath = "";