From f05c8c03c9331a96a65801473b1599ecec4123b7 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 15 May 2024 13:50:32 +0200 Subject: [PATCH] evomaintenance: move upstream files into upstream folder --- CHANGELOG.md | 1 + evomaintenance/files/evomaintenance.tpl | 33 ------ evomaintenance/files/upstream/CHANGELOG.md | 100 ++++++++++++++++++ evomaintenance/files/upstream/README.md | 30 ++++++ .../files/{ => upstream}/evomaintenance.sh | 0 .../tasks/install_vendor_debian.yml | 11 +- 6 files changed, 135 insertions(+), 40 deletions(-) delete mode 100644 evomaintenance/files/evomaintenance.tpl create mode 100644 evomaintenance/files/upstream/CHANGELOG.md create mode 100644 evomaintenance/files/upstream/README.md rename evomaintenance/files/{ => upstream}/evomaintenance.sh (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19d2a822..f3383389 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The **patch** part is incremented if multiple releases happen the same month * evolinux-base: improve adding the current user to SSH AllowGroups of AllowUsers * evolinux-users: improve SSH configuration * evomaintenance: upstream release 24.05 +* evomaintenance: move upstream files into upstream folder ### Fixed diff --git a/evomaintenance/files/evomaintenance.tpl b/evomaintenance/files/evomaintenance.tpl deleted file mode 100644 index ddddd7b6..00000000 --- a/evomaintenance/files/evomaintenance.tpl +++ /dev/null @@ -1,33 +0,0 @@ -From: __FULLFROM__ -Content-Type: text/plain; charset=UTF-8 -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -To: __TO__ -Subject: [evomaintenance] Intervention sur __HOSTNAME__ (__USER__) - -Bonjour, - -Une intervention vient de se terminer sur votre serveur. -Voici les renseignements sur l'intervention : - -Nom du serveur : __HOSTNAME__ -Personne ayant réalisée l'intervention : __USER__ -Intervention réalisée depuis : __IP__ -Début de l'intervention : __BEGIN_DATE__ -Fin de l'intervention : __END_DATE__ - -### -Renseignements sur l'intervention : -__TEXTE__ -### - -__GIT_COMMITS__ - -Pour réagir à cette intervention, vous pouvez répondre à ce message -(sur l'adresse mail __FROM__). En cas d'urgence, utilisez -l'adresse __URGENCYFROM__ ou notre téléphone portable d'astreinte -(__URGENCYTEL__) - -Cordialement, --- -__FULLFROM__ diff --git a/evomaintenance/files/upstream/CHANGELOG.md b/evomaintenance/files/upstream/CHANGELOG.md new file mode 100644 index 00000000..5e0a599a --- /dev/null +++ b/evomaintenance/files/upstream/CHANGELOG.md @@ -0,0 +1,100 @@ +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project **does not adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)**. + +## [Unreleased] + +### Added + +Add missing (but documented) `--(no-)evocheck` options + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [23.10.1] - 2023-10-09 + +### Fixed + +* Use a special variable name since USER is always defined from the environment + +## [23.10] - 2023-10-09 + +### Added + +* Force a user name with `-u,--user` option (default is still `logname(1)`). +* More people credited + +### Deprecated + +* `--autosysadmin` is replaced by `--user autosysadmin` + + + +## [22.07] - 2022-07-05 + +### Added + +* Add `--autosysadmin` flag +* Commit change in /etc of lxc containers + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [22.01] - 2022-01-25 + +### Added + +* version/host/user headers in sent email + +### Changed + +New version pattern + +## [0.6.4] - 2021-06-17 + +### Added + +* fallback if findmnt is absent + +## [0.6.3] - 2020-02-02 + +### Added + +* Notify syslog when partitions are re-mounted (Linux) + +## [0.6.2] - 2020-02-02 + +### Fixed + +* better detection of read-only partitions (Linux) + +## [0.6.0] - 2019-11-05 + +### Added + +* commit changes in /usr/share/scripts/ if needed + +## Previous changelog + +* 0.5.0 : options et mode interactif pour l'exécution des actions, meilleure compatibilité POSIX +* 0.4.1 : Utilisation de "printf" à la place de "echo" pour mieux gérer les sauts de ligne +* 0.4.0 : Amélioration de la récupération d'information (plus de cas gérés). Infos Git avant la saisie. +* 0.3.0 : Écriture dans un fichier de log, amélioration de la récupération d'informations, amélioration de la syntaxe shell +* 0.2.7 : Correction d'un bug lors de l'utilisation de '&' dans le texte +* 0.2.6 : Precision du charset dans les entetes du mail +* 0.2.5 : Correction d'un bug avec le path de sendmail sous OpenBSD +* 0.2.4 : Correction d'un bug lors de l'utilisation de '/' dans le texte +* 0.2.3 : Correction d'un bug avec $REALM diff --git a/evomaintenance/files/upstream/README.md b/evomaintenance/files/upstream/README.md new file mode 100644 index 00000000..07ec14d3 --- /dev/null +++ b/evomaintenance/files/upstream/README.md @@ -0,0 +1,30 @@ +# Evomaintenance + +```.plain +$ evomaintenance --help +evomaintenance is a program that helps reporting what you've done on a server + +Usage: evomaintenance + or evomaintenance --message="add new host" + or evomaintenance --no-api --no-mail --no-commit + or echo "add new vhost" | evomaintenance + +Options + -m, --message=MESSAGE set the message from the command line + --mail enable the mail hook (default) + --no-mail disable the mail hook + --db enable the database hook + --no-db disable the database hook (default) + --api enable the API hook (default) + --no-api disable the API hook + --commit enable the commit hook (default) + --no-commit disable the commit hook + --evocheck enable evocheck execution (default) + --no-evocheck disable evocheck execution + --auto use "auto" mode + --no-auto use "manual" mode (default) + -v, --verbose increase verbosity + -n, --dry-run actions are not executed + --help print this message and exit + --version print version and exit +``` diff --git a/evomaintenance/files/evomaintenance.sh b/evomaintenance/files/upstream/evomaintenance.sh similarity index 100% rename from evomaintenance/files/evomaintenance.sh rename to evomaintenance/files/upstream/evomaintenance.sh diff --git a/evomaintenance/tasks/install_vendor_debian.yml b/evomaintenance/tasks/install_vendor_debian.yml index 7241081c..78fcabac 100644 --- a/evomaintenance/tasks/install_vendor_debian.yml +++ b/evomaintenance/tasks/install_vendor_debian.yml @@ -35,15 +35,12 @@ - name: Evomaintenance script and template are installed ansible.builtin.copy: - src: "{{ item.src }}" - dest: "{{ item.dest }}" + src: "upstream/evomaintenance.sh" + dest: "/usr/share/scripts/" owner: root group: root - mode: "{{ item.mode }}" + mode: "0700" force: true backup: yes - loop: - - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' } - - { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' } tags: - - evomaintenance \ No newline at end of file + - evomaintenance