Compare commits

...

13 Commits

Author SHA1 Message Date
46c375aec5 feat(pikvm): Move cert files from /tmp
We now have acme.sh copy cert files into a directory that's writable,
specifically into '/tmp', this happens outside the scope of this
script purely within acme.sh. Most mounts remain mounted read-only so
we amend this script to make the '/' mount point read-writable and move
cert files into their correct location before making the '/' mount
point read-only again.
2025-06-03 23:50:53 +02:00
4fbe494b58 Revert "feat(zabbixserver): Strip unneeded file"
This reverts commit b85431af75.
2025-02-22 05:20:23 +01:00
9e9b071814 feat(freepbx): Adjust for FreePBX 17 (up from 16) 2025-02-05 01:30:51 +01:00
b85431af75 feat(zabbixserver): Strip unneeded file 2025-01-31 03:18:04 +01:00
98dc809f12 feat(zabbixserver): Restart Zabbix server when DB gets a new cert 2025-01-31 00:49:59 +01:00
8c4bafb3cd feat(zabbixserver): Use generic cert file names 2025-01-30 23:31:10 +01:00
44a128f3c1 feat(zabbixserver): Use generic cert file names 2025-01-30 22:47:25 +01:00
04bc2ab042 fix(zabbixserver): Reorder Nginx dir 2025-01-29 02:09:35 +01:00
6cbcfdd92d feat(mysql): Make executable 2025-01-28 00:23:39 +01:00
c3ab8652d5 feat(mysql): Add config for reloads 2025-01-28 00:22:21 +01:00
d01155a616 Reload nginx.service 2024-12-25 19:35:02 +01:00
b38056a70a Make one_container_restart executable 2024-08-17 20:13:42 +02:00
3fe2b1a4bc Add script to simply restart a container 2024-08-17 20:12:20 +02:00
8 changed files with 41 additions and 8 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.idea

View File

@@ -5,8 +5,9 @@ fwconsole certificates --import
fwconsole certificates --updateall
for certfile in pem key crt; do
rsync -av --itemize-changes {'/etc/asterisk/keys/'"${fqdn}",'/etc/httpd/pki/webserver'}'.'"${certfile}"
rsync -av --itemize-changes {'/etc/asterisk/keys/'"${fqdn}",'/etc/apache2/pki/webserver'}'.'"${certfile}"
done
fwconsole reload
systemctl reload httpd
apachectl configtest &>/dev/null && \
fwconsole reload && \
systemctl try-reload-or-restart apache2.service

14
mysql_reload.sh Executable file
View File

@@ -0,0 +1,14 @@
#!/bin/bash
declare mysql_container="${1:?}"
if systemctl --quiet is-active docker.service; then
if [[ "$( docker container inspect -f '{{.State.Running}}' "${mysql_container}" 2> /dev/null )" == "true" ]]; then
if docker exec -t "${mysql_container}" bash -c 'mysqld --validate-config' &>/dev/null; then
docker restart "$(docker ps -qaf name="${mysql_container}")"
else
printf -- '%s\n' \
'MySQL config of container '"'${mysql_container}'"' does not validate.' \
'See: docker exec -t '"'${mysql_container}'"' bash -c '"'"'mysqld --validate-config'"'"'.' \
'We will leave the container running as-is.'
fi
fi
fi

5
nginx_systemd_reload.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/bin/bash
nginx -t || exit 1
if systemctl --quiet is-active nginx.service; then
systemctl try-reload-or-restart nginx.service || exit 1
fi

7
one_container_restart Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
declare container_name="${1:?}"
if systemctl --quiet is-active docker.service; then
if [[ "$( docker container inspect -f '{{.State.Running}}' "${container_name}" 2> /dev/null )" == "true" ]]; then
docker restart "${container_name}"
fi
fi

View File

@@ -1,6 +1,8 @@
#!/bin/bash
rw
cert_location='/etc/kvmd/nginx/ssl'
for cert_file in 'server.crt' 'server.key'; do
mv --force --verbose '/tmp/'"${cert_file}" "${cert_location%/}"'/'
chmod -v '0444' "${cert_location%/}"'/'"${cert_file}"
done
systemctl restart kvmd-nginx.service

View File

@@ -1,11 +1,13 @@
#!/bin/bash
cert_name="${1:?}"
compose_ctx="${2:?}"
compose_ctx="${1:?}"
chown -v '70:70' '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/postgres/config/cert/'{'ca.cer',"${cert_name}"'.'{'cer','key'}}
chmod -v '0600' '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/postgres/config/cert/'{'ca.cer',"${cert_name}"'.'{'cer','key'}}
chown -v '70:70' '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/postgres/config/cert/'{'.ZBX_DB_CA_FILE','.ZBX_DB_CERT_FILE','.ZBX_DB_KEY_FILE'}
chmod -v '0600' '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/postgres/config/cert/'{'.ZBX_DB_CA_FILE','.ZBX_DB_CERT_FILE','.ZBX_DB_KEY_FILE'}
if systemctl --quiet is-active docker.service; then
if [ "$( docker container inspect -f '{{.State.Running}}' 'zabbixserver-postgres-'"${compose_ctx}" )" = "true" ]; then
docker exec -t 'zabbixserver-postgres-'"${compose_ctx}" sh -c 'pg_ctl reload -s'
fi
if [ "$( docker container inspect -f '{{.State.Running}}' 'zabbixserver-zabbixserver-'"${compose_ctx}" )" = "true" ]; then
docker exec -t 'zabbixserver-zabbixserver-'"${compose_ctx}" sh -c 'zabbix_server --runtime-control config_cache_reload'
fi
fi

View File

@@ -3,7 +3,8 @@ global_nginx_container_name="${1:?}"
compose_ctx="${2:?}"
reverse_fqdn_cert_id="${3:?}"
rsync -av '/opt/docker-data/nginx/'"${global_nginx_container_name}"'/conf/certs/'"${reverse_fqdn_cert_id}"{'_fullchain.cer','.key'} '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/zabbixwebnginx/config/cert/'
rsync -av '/opt/docker-data/'"${global_nginx_container_name}"'/nginx/conf/certs/'"${reverse_fqdn_cert_id}"'.key' '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/zabbixwebnginx/config/cert/ssl.key'
rsync -av '/opt/docker-data/'"${global_nginx_container_name}"'/nginx/conf/certs/'"${reverse_fqdn_cert_id}"'_fullchain.cer' '/opt/docker-data/zabbixserver-'"${compose_ctx}"'/zabbixwebnginx/config/cert/ssl.crt'
chown -v -R '101:101' '/opt/docker-data/zabbixserver-loft/zabbixwebnginx/config/cert'
if systemctl --quiet is-active docker.service; then
if [ "$( docker container inspect -f '{{.State.Running}}' "${global_nginx_container_name}" 2> /dev/null )" = "true" ]; then