diff --git a/extra/bitwarden.yml b/extra/bitwarden.yml index 377b4b8..cd66424 100644 --- a/extra/bitwarden.yml +++ b/extra/bitwarden.yml @@ -19,7 +19,7 @@ services: - "traefik.http.routers.bitwarden-https.tls.certresolver=basic" - "traefik.http.services.bitwarden-service.loadbalancer.server.port=80" ports: - - 3012:3012/tcp + - "${MISTBORN_BIND_IP}:3012:3012/tcp" restart: unless-stopped networks: diff --git a/extra/jitsi-meet.yml b/extra/jitsi-meet.yml index 421f2a3..4a92b8e 100644 --- a/extra/jitsi-meet.yml +++ b/extra/jitsi-meet.yml @@ -216,8 +216,8 @@ services: image: jitsi/jvb:latest restart: unless-stopped ports: - - '${JVB_PORT}:${JVB_PORT}/udp' - - '${JVB_TCP_PORT}:${JVB_TCP_PORT}' + - "${MISTBORN_BIND_IP}:${JVB_PORT}:${JVB_PORT}/udp" + - "${MISTBORN_BIND_IP}:${JVB_TCP_PORT}:${JVB_TCP_PORT}" volumes: - ${CONFIG}/jvb:/config:Z env_file: diff --git a/extra/syncthing.yml b/extra/syncthing.yml index 6083393..f66bd73 100644 --- a/extra/syncthing.yml +++ b/extra/syncthing.yml @@ -15,8 +15,8 @@ services: - ../../mistborn_volumes/extra/syncthing/data2:/data2 ports: #- 8384:8384 - - 22000:22000/tcp # listening port - - 21027:21027/udp # protocol discovery + - "${MISTBORN_BIND_IP}:22000:22000/tcp" # listening port + - "${MISTBORN_BIND_IP}:21027:21027/udp" # protocol discovery labels: - "traefik.enable=true" - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.mistborn`)" diff --git a/extra/tor.yml b/extra/tor.yml index f8c4141..6b06975 100644 --- a/extra/tor.yml +++ b/extra/tor.yml @@ -8,7 +8,7 @@ services: image: mistborn_production_tor container_name: mistborn_production_tor ports: - - 9150:9150/tcp + - "${MISTBORN_BIND_IP}:9150:9150/tcp" networks: default: diff --git a/scripts/services/Mistborn-base.service b/scripts/services/Mistborn-base.service index 9f82b72..46e513c 100644 --- a/scripts/services/Mistborn-base.service +++ b/scripts/services/Mistborn-base.service @@ -7,6 +7,7 @@ After=netfilter-persistent.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/wazuh/agent.sh b/scripts/services/wazuh/agent.sh index 222d664..dca4832 100755 --- a/scripts/services/wazuh/agent.sh +++ b/scripts/services/wazuh/agent.sh @@ -6,10 +6,14 @@ if dpkg -s wazuh-agent &> /dev/null; then exit 0 fi +# install curl +echo "install curl" +sudo apt-get install -y curl + # prepare repo echo "Adding Wazuh Repository" -curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - -echo "deb https://packages.wazuh.com/4.x/apt/ stable main" | tee -a /etc/apt/sources.list.d/wazuh.list +curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | sudo apt-key add - +echo "deb https://packages.wazuh.com/4.x/apt/ stable main" | sudo tee /etc/apt/sources.list.d/wazuh.list apt-get update