diff --git a/ansible/host_vars/tipi.yml b/ansible/host_vars/tipi.yml index c2b3f114..a3e03620 100644 --- a/ansible/host_vars/tipi.yml +++ b/ansible/host_vars/tipi.yml @@ -3,5 +3,4 @@ packages: - ufw - coreutils - git - - docker - - openssh-server \ No newline at end of file + - docker \ No newline at end of file diff --git a/ansible/tasks/common/essential.yml b/ansible/tasks/common/essential.yml index 6f2badd5..269cc368 100644 --- a/ansible/tasks/common/essential.yml +++ b/ansible/tasks/common/essential.yml @@ -60,7 +60,3 @@ name: ufw state: started enabled: yes - -- name: Enable UFW - community.general.ufw: - state: enabled diff --git a/docker-compose.yml b/docker-compose.yml index e8cd112e..dff05e58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,8 @@ services: ## Docker sock - /var/run/docker.sock:/var/run/docker.sock:ro - ${PWD}:/tipi + environment: + - INTERNAL_IP=${INTERNAL_IP} networks: tipi_main_network: ipv4_address: 10.21.21.3 @@ -38,8 +40,6 @@ services: networks: tipi_main_network: ipv4_address: 10.21.21.4 - environment: - - INTERNAL_IP=${INTERNAL_IP} labels: traefik.enable: true traefik.http.routers.dashboard.rule: PathPrefix("/") # Host(`tipi.local`) && diff --git a/scripts/start.sh b/scripts/start.sh index af900fcc..c0d12109 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -116,7 +116,7 @@ done mv -f "$ENV_FILE" "$ROOT_FOLDER/.env" mv -f "$ENV_FILE_SYSTEM_API" "$ROOT_FOLDER/packages/system-api/.env" -ansible-playbook ansible/start.yml -i ansible/hosts -K -e username="$USERNAME" +# ansible-playbook ansible/start.yml -i ansible/hosts -K -e username="$USERNAME" # Run docker-compose docker-compose --env-file "${ROOT_FOLDER}/.env" up --detach --remove-orphans --build || {