evomaintenance: upstream release 24.05
This commit is contained in:
parent
7f76cc14f5
commit
4b8d89bddb
|
@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
* forwarding: added tags to distinguish IPv4 from IPv6
|
* forwarding: added tags to distinguish IPv4 from IPv6
|
||||||
* accounts: add a "users" tag so that new users are not created and customized password are not reset based on vars files when executing evolixisation.yml again
|
* accounts: add a "users" tag so that new users are not created and customized password are not reset based on vars files when executing evolixisation.yml again
|
||||||
* base: Generate default (self-signed) certificate
|
* base: Generate default (self-signed) certificate
|
||||||
|
* evomaintenance: upstream release 24.05
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue