diff --git a/zabbix_db_reload.sh b/zabbix_db_reload.sh index aea516e..ae562f4 100755 --- a/zabbix_db_reload.sh +++ b/zabbix_db_reload.sh @@ -2,8 +2,8 @@ cert_name="${1:?}" compose_ctx="${2:?}" -chown -v '70:70' '/opt/docker-data/zabbixserver/postgres/conf/cert/'{'ca.cer',"${cert_name}"'.'{'cer','key'}} -chmod -v '0600' '/opt/docker-data/zabbixserver/postgres/conf/cert/'{'ca.cer',"${cert_name}"'.'{'cer','key'}} +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'}} 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' diff --git a/zabbix_web_reload.sh b/zabbix_web_reload.sh index 003adfa..71088b1 100755 --- a/zabbix_web_reload.sh +++ b/zabbix_web_reload.sh @@ -3,8 +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/zabbixwebnginx/conf/cert/' -chown -v -R '101:101' '/opt/docker-data/zabbixserver/zabbixwebnginx/conf/cert' +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/' +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 docker exec -t "${global_nginx_container_name}" sh -c 'nginx -t &>/dev/null' && \