diff --git a/helpers/command.py b/helpers/command.py index 61b84e7..8063d03 100644 --- a/helpers/command.py +++ b/helpers/command.py @@ -374,10 +374,11 @@ def start(cls, frontend_only=False, force_setup=False): # Let's Encrypt NGINX container needs kobo-docker NGINX # container to be started first config.init_letsencrypt() - else: - proxy_command = run_docker_compose(dict_, ['up', '-d']) - CLI.run_command(proxy_command, - config.get_letsencrypt_repo_path()) + + proxy_command = run_docker_compose(dict_, ['up', '-d']) + CLI.run_command( + proxy_command, config.get_letsencrypt_repo_path() + ) if dict_['maintenance_enabled']: CLI.colored_print( diff --git a/helpers/config.py b/helpers/config.py index ee6bb04..dffecaf 100644 --- a/helpers/config.py +++ b/helpers/config.py @@ -31,8 +31,8 @@ class Config(metaclass=Singleton): DEFAULT_PROXY_PORT = '8080' DEFAULT_NGINX_PORT = '80' DEFAULT_NGINX_HTTPS_PORT = '443' - KOBO_DOCKER_BRANCH = '2.023.21b' - KOBO_INSTALL_VERSION = '8.1.0' + KOBO_DOCKER_BRANCH = '2.023.37i' + KOBO_INSTALL_VERSION = '8.1.1' MAXIMUM_AWS_CREDENTIAL_ATTEMPTS = 3 ALLOWED_PASSWORD_CHARACTERS = ( string.ascii_letters diff --git a/helpers/template.py b/helpers/template.py index 8ccf622..0814152 100644 --- a/helpers/template.py +++ b/helpers/template.py @@ -322,7 +322,7 @@ def _get_value(property_, true_value='', false_value='#', ), # Keep leading space in front of suffix if any 'DOCKER_COMPOSE_SUFFIX': _get_value( - 'compose_version', '', ' compose', 'v1' + 'compose_version', '', 'compose', 'v1' ) } diff --git a/readme.md b/readme.md index e0a6595..367d4ed 100644 --- a/readme.md +++ b/readme.md @@ -147,9 +147,9 @@ User can choose between 2 types of installations: ## Requirements - Linux 5 / macOS 6 -- Python 3.7+ -- [Docker](https://www.docker.com/get-started "") & [Docker Compose](https://docs.docker.com/compose/install/ "") -- Available TCP Ports: 7 +- Python 3.8+ +- [Docker](https://www.docker.com/get-started "") 7 +- Available TCP Ports: 8 1. 80 NGINX 1. 443 NGINX (if you use kobo-install with LetsEncrypt proxy) @@ -163,11 +163,13 @@ User can choose between 2 types of installations: - _If you use a firewall, be sure to open traffic publicly on NGINX port, otherwise kobo-install cannot work_ - _By default, additional ports are not exposed except when using multi servers configuration. If you choose to expose them, **be sure to not expose them publicly** (e.g. use a firewall and allow traffic between front-end and back-end containers only. NGINX port still has to stay publicly opened though)._ -5) _It has been tested with Ubuntu 14.04, 16.04 and 18.04, CentOS 8_ +5) _It has been tested with Ubuntu 18.04, 20.04 and 22.04_ 6) _Docker on macOS is slow. First boot usually takes a while to be ready. You may have to answer `Yes` once or twice to question `Wait for another 600 seconds?` when prompted_ -7) _These are defaults but can be customized with advanced options_ +7) _Compose V1 is still supported but has reached its EOL from July 2023_ + +8) _These are defaults but can be customized with advanced options_ ## Tests diff --git a/templates/nginx-certbot/init-letsencrypt.sh.tpl b/templates/nginx-certbot/init-letsencrypt.sh.tpl index 6d62727..87e8d33 100644 --- a/templates/nginx-certbot/init-letsencrypt.sh.tpl +++ b/templates/nginx-certbot/init-letsencrypt.sh.tpl @@ -13,7 +13,7 @@ DOCKER_COMPOSE_CMD="$$(which ${DOCKER_COMPOSE_CMD})" CURL_CMD=$$(which curl) -if [ -d "$$DATA_PATH" ]; then +if [ -d "$$DATA_PATH/conf/live/$$DOMAINS" ]; then read -p "Existing data found for $$DOMAINS_CSV. Continue and replace existing certificate? (y/N) " decision if [ "$$decision" != "Y" ] && [ "$$decision" != "y" ]; then exit @@ -78,4 +78,4 @@ $$DOCKER_COMPOSE_CMD ${DOCKER_COMPOSE_SUFFIX} run --rm --entrypoint "\ echo echo "### Reloading nginx ..." -$$DOCKER_COMPOSE_CMD exec nginx_ssl_proxy nginx -s reload +$$DOCKER_COMPOSE_CMD ${DOCKER_COMPOSE_SUFFIX} exec nginx_ssl_proxy nginx -s reload