Compare commits
9 commits
Author | SHA1 | Date | |
---|---|---|---|
Jérémy Lecour | fe1e66f79c | ||
Jérémy Lecour | 2e529524f7 | ||
Jérémy Lecour | f05c8c03c9 | ||
Jérémy Lecour | 24f1e72147 | ||
Jérémy Lecour | 22f7a6b831 | ||
Jérémy Lecour | 4128962d05 | ||
c1dc380e85 | |||
Jérémy Lecour | 145b279a12 | ||
Jérémy Lecour | 2a856d579e |
26
CHANGELOG.md
26
CHANGELOG.md
|
@ -13,22 +13,32 @@ The **patch** part is incremented if multiple releases happen the same month
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
* apt: add list-upgradable-held-packages.sh
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
* evobackup-client: upstream release 24.05
|
|
||||||
* evolinux-base: improve adding the current user to SSH AllowGroups of AllowUsers
|
|
||||||
* evolinux-users: improve SSH configuration
|
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
* apt: use archive.debian.org with Buster
|
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
### Security
|
### Security
|
||||||
|
|
||||||
|
## [24.05] 2024-05-15
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
* apt: add list-upgradable-held-packages.sh
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
* evobackup-client: upstream release 24.05.1
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* apt: use archive.debian.org with Buster
|
||||||
|
|
||||||
## [24.04] 2024-04-30
|
## [24.04] 2024-04-30
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -23,6 +23,12 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
||||||
|
|
||||||
### Security
|
### Security
|
||||||
|
|
||||||
|
## [24.05.1] - 2022-05-14
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
* client: fix shell syntax error
|
||||||
|
|
||||||
## [24.05] - 2022-05-02
|
## [24.05] - 2022-05-02
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck disable=SC2034,SC2317
|
# shellcheck disable=SC2034,SC2317
|
||||||
|
|
||||||
readonly VERSION="24.05"
|
readonly VERSION="24.05.1"
|
||||||
|
|
||||||
# set all programs to C language (english)
|
# set all programs to C language (english)
|
||||||
export LC_ALL=C
|
export LC_ALL=C
|
||||||
|
|
|
@ -105,7 +105,7 @@ test_server() {
|
||||||
pick_server() {
|
pick_server() {
|
||||||
local -i increment=${1:-0}
|
local -i increment=${1:-0}
|
||||||
local -i list_length=${#SERVERS[@]}
|
local -i list_length=${#SERVERS[@]}
|
||||||
local sync_name=${2:""}
|
local sync_name=${2:-""}
|
||||||
|
|
||||||
if (( increment >= list_length )); then
|
if (( increment >= list_length )); then
|
||||||
# We've reached the end of the list
|
# We've reached the end of the list
|
||||||
|
|
|
@ -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__
|
|
100
evomaintenance/files/upstream/CHANGELOG.md
Normal file
100
evomaintenance/files/upstream/CHANGELOG.md
Normal file
|
@ -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
|
30
evomaintenance/files/upstream/README.md
Normal file
30
evomaintenance/files/upstream/README.md
Normal file
|
@ -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
|
||||||
|
```
|
|
@ -1,12 +1,12 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
VERSION="23.10.1"
|
VERSION="24.05"
|
||||||
|
|
||||||
show_version() {
|
show_version() {
|
||||||
cat <<END
|
cat <<END
|
||||||
evomaintenance version ${VERSION}
|
evomaintenance version ${VERSION}
|
||||||
|
|
||||||
Copyright 2007-2023 Evolix <info@evolix.fr>,
|
Copyright 2007-2024 Evolix <info@evolix.fr>,
|
||||||
Gregory Colpart <reg@evolix.fr>,
|
Gregory Colpart <reg@evolix.fr>,
|
||||||
Jérémy Lecour <jlecour@evolix.fr>,
|
Jérémy Lecour <jlecour@evolix.fr>,
|
||||||
Brice Waegeneire <bwaegeneire@evolix.fr>,
|
Brice Waegeneire <bwaegeneire@evolix.fr>,
|
||||||
|
@ -437,6 +437,14 @@ while :; do
|
||||||
printf 'ERROR: "--message" requires a non-empty option argument.\n' >&2
|
printf 'ERROR: "--message" requires a non-empty option argument.\n' >&2
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
--no-evocheck)
|
||||||
|
# disable evocheck hook
|
||||||
|
EVOCHECK=0
|
||||||
|
;;
|
||||||
|
--evocheck)
|
||||||
|
# enable evocheck hook
|
||||||
|
EVOCHECK=1
|
||||||
|
;;
|
||||||
--no-commit)
|
--no-commit)
|
||||||
# disable commit hook
|
# disable commit hook
|
||||||
HOOK_COMMIT=0
|
HOOK_COMMIT=0
|
||||||
|
@ -581,7 +589,7 @@ GIT_REPOSITORIES="/etc /etc/bind /usr/share/scripts"
|
||||||
|
|
||||||
# Add /etc directories from lxc containers if they are git directories
|
# Add /etc directories from lxc containers if they are git directories
|
||||||
if [ -d /var/lib/lxc ]; then
|
if [ -d /var/lib/lxc ]; then
|
||||||
GIT_REPOSITORIES="${GIT_REPOSITORIES} $(find /var/lib/lxc/ -maxdepth 3 -name 'etc' | tr '\n' ' ' | sed 's/[[:space:]]\+$//')"
|
GIT_REPOSITORIES="${GIT_REPOSITORIES} $(find -L /var/lib/lxc/ -maxdepth 3 -name 'etc' | tr '\n' ' ' | sed 's/[[:space:]]\+$//')"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# initialize variable
|
# initialize variable
|
|
@ -35,15 +35,12 @@
|
||||||
|
|
||||||
- name: Evomaintenance script and template are installed
|
- name: Evomaintenance script and template are installed
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
src: "{{ item.src }}"
|
src: "upstream/evomaintenance.sh"
|
||||||
dest: "{{ item.dest }}"
|
dest: "/usr/share/scripts/"
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
mode: "{{ item.mode }}"
|
mode: "0700"
|
||||||
force: true
|
force: true
|
||||||
backup: yes
|
backup: yes
|
||||||
loop:
|
|
||||||
- { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' }
|
|
||||||
- { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' }
|
|
||||||
tags:
|
tags:
|
||||||
- evomaintenance
|
- evomaintenance
|
||||||
|
|
|
@ -1,52 +1,29 @@
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
Version: GnuPG v1
|
|
||||||
Comment: GPGTools - https://gpgtools.org
|
|
||||||
|
|
||||||
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
|
=MARt
|
||||||
41nuxZDSuBJhDeFIp0ccnN2Lp1o6XfIeDYPegyEPSSZqrudfqLrSZhStDlJgXjea
|
|
||||||
JjW6UP6txPtYaaila9/Hn6vF87AQ5bR2dEWB/xRJzgNwRiax7KSU0xca6xAuf+TD
|
|
||||||
xCjZ5pp2JwdCjquXLTmUnbIZ9LGV54UZ/MeiG8yVu6pxbiGnXo4Ekbk6xgi1ewLi
|
|
||||||
vGmz4QRfVklV0dba3Zj0fRozfZ22qUHxCfDM7ad0eBXMFmHiN8hg3IUHTO+UdlX/
|
|
||||||
aH3gADFAvSVDv0v8t6dGc6XE9Dr7mGEFnQMHO4zhM1HaS2Nh0TiL2tFLttLbfG5o
|
|
||||||
QlxCfXX9/nasj3K9qnlEg9G3+4T7lpdPmZRRe1O8cHCI5imVg6cLIiBLPO16e0fK
|
|
||||||
yHIgYswLdrJFfaHNYM/SWJxHpX795zn+iCwyvZSlLfH9mlegOeVmj9cyhN/VOmS3
|
|
||||||
QRhlYXoA2z7WZTNoC6iAIlyIpMTcZr+ntaGVtFOLS6fwdBqDXjmSQu66mDKwU5Ek
|
|
||||||
fNlbyrpzZMyFCDWEYo4AIR/18aGZBYUAEQEAAYkCHwQYAQIACQUCU5sktgIbDAAK
|
|
||||||
CRAWVaCraFdigIPQEACcYh8rR19wMZZ/hgYv5so6Y1HcJNARuzmffQKozS/rxqec
|
|
||||||
0xM3wceL1AIMuGhlXFeGd0wRv/RVzeZjnTGwhN1DnCDy1I66hUTgehONsfVanuP1
|
|
||||||
PZKoL38EAxsMzdYgkYH6T9a4wJH/IPt+uuFTFFy3o8TKMvKaJk98+Jsp2X/QuNxh
|
|
||||||
qpcIGaVbtQ1bn7m+k5Qe/fz+bFuUeXPivafLLlGc6KbdgMvSW9EVMO7yBy/2JE15
|
|
||||||
ZJgl7lXKLQ31VQPAHT3an5IV2C/ie12eEqZWlnCiHV/wT+zhOkSpWdrheWfBT+ac
|
|
||||||
hR4jDH80AS3F8jo3byQATJb3RoCYUCVc3u1ouhNZa5yLgYZ/iZkpk5gKjxHPudFb
|
|
||||||
DdWjbGflN9k17VCf4Z9yAb9QMqHzHwIGXrb7ryFcuROMCLLVUp07PrTrRxnO9A/4
|
|
||||||
xxECi0l/BzNxeU1gK88hEaNjIfviPR/h6Gq6KOcNKZ8rVFdwFpjbvwHMQBWhrqfu
|
|
||||||
G3KaePvbnObKHXpfIKoAM7X2qfO+IFnLGTPyhFTcrl6vZBTMZTfZiC1XDQLuGUnd
|
|
||||||
sckuXINIU3DFWzZGr0QrqkuE/jyr7FXeUJj9B7cLo+s/TXo+RaVfi3kOc9BoxIvy
|
|
||||||
/qiNGs/TKy2/Ujqp/affmIMoMXSozKmga81JSwkADO1JMgUy6dApXz9kP4EE3g==
|
|
||||||
=CLGF
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
- name: Add NodeJS repository (Debian <12)
|
- name: Add NodeJS repository (Debian <12)
|
||||||
ansible.builtin.apt_repository:
|
ansible.builtin.apt_repository:
|
||||||
repo: "deb [signed-by={{ apt_keyring_dir }}/nodesource.asc] https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_distribution_release }} main"
|
repo: "deb [signed-by={{ apt_keyring_dir }}/nodesource.asc] https://deb.nodesource.com/{{ nodejs_apt_version }} nodistro main"
|
||||||
filename: nodesource
|
filename: nodesource
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
state: present
|
state: present
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Types: deb
|
Types: deb
|
||||||
URIs: https://deb.nodesource.com/{{ nodejs_apt_version }}
|
URIs: https://deb.nodesource.com/{{ nodejs_apt_version }}
|
||||||
Suites: {{ ansible_distribution_release }}
|
Suites: nodistro
|
||||||
Components: main
|
Components: main
|
||||||
Signed-by: {{ apt_keyring_dir }}/nodesource.asc
|
Signed-by: {{ apt_keyring_dir }}/nodesource.asc
|
||||||
Enabled: yes
|
Enabled: yes
|
||||||
|
|
|
@ -31,11 +31,11 @@
|
||||||
marker: "## {mark} ANSIBLE MANAGED INPUT RULES FOR VRID {{ vrrp_address.id }}"
|
marker: "## {mark} ANSIBLE MANAGED INPUT RULES FOR VRID {{ vrrp_address.id }}"
|
||||||
block: |
|
block: |
|
||||||
{% if vrrp_address.peers | default([]) | length <= 0 %}
|
{% if vrrp_address.peers | default([]) | length <= 0 %}
|
||||||
/sbin/iptables -A INPUT -i {{ vrrp_address.interface }} -d 224.0.0.0/8 -j ACCEPT # Allow VRRP input on {{ vrrp_address.interface }} for VRID {{ vrrp_address.id }}
|
/sbin/iptables -A INPUT -i {{ vrrp_address.interface }} -d 224.0.0.0/8 -j ACCEPT # Allow VRRP input on {{ vrrp_address.interface }} for VRID {{ vrrp_address.id }}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% for peer in vrrp_address.peers %}
|
{% for peer in vrrp_address.peers %}
|
||||||
/sbin/iptables -A INPUT -i {{ vrrp_address.interface }} -s {{ peer }} -d 224.0.0.0/8 -j ACCEPT # Allow VRRP input on {{ vrrp_address.interface }} from {{ peer }} for VRID {{ vrrp_address.id }}
|
/sbin/iptables -A INPUT -i {{ vrrp_address.interface }} -s {{ peer }} -d 224.0.0.0/8 -j ACCEPT # Allow VRRP input on {{ vrrp_address.interface }} from {{ peer }} for VRID {{ vrrp_address.id }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
create: yes
|
create: yes
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
|
|
Loading…
Reference in a new issue