diff --git a/nginx_templates/conf.d/default.conf.template b/nginx_templates/conf.d/default.conf.template index 802075a..90f77d3 100644 --- a/nginx_templates/conf.d/default.conf.template +++ b/nginx_templates/conf.d/default.conf.template @@ -1,6 +1,5 @@ server { listen 80; - listen [::]:80; return 301 https://$host$request_uri; } diff --git a/nginx_templates/ssl_listen.conf.template b/nginx_templates/ssl_listen.conf.template index bd12aaf..7ba9498 100644 --- a/nginx_templates/ssl_listen.conf.template +++ b/nginx_templates/ssl_listen.conf.template @@ -1,5 +1,4 @@ listen 443 ssl; -listen [::]:443 ssl; http2 on; diff --git a/setup.sh b/setup.sh index defb4df..4bf0862 100755 --- a/setup.sh +++ b/setup.sh @@ -107,7 +107,7 @@ function write_config() env "${new_vars[@]}" envsubst "$vars" < "$src" > "$temp" || { rm -f "$temp"; exit 1; } chmod "$mode" "$temp" || { rm -f "$temp"; exit 1; } chown "$owner" "$temp" || { rm -f "$temp"; exit 1; } - if [[ ! -f "$dest" ]] && mv -v -T "$temp" "$dest"; then + if mv -n -T "$temp" "$dest"; then return 0 fi if diff -u --label="expanded $src" "$temp" "$dest"; then diff --git a/templates/etc/docker/daemon.json b/templates/etc/docker/daemon.json index efb9015..a442642 100644 --- a/templates/etc/docker/daemon.json +++ b/templates/etc/docker/daemon.json @@ -1,41 +1,3 @@ { - "storage-driver": "overlay2", - "ipv6": true, - "fixed-cidr-v6": "fd57:d7e4:f221::/64", - "experimental": true, - "ip6tables": true, - "default-address-pools": [ - { - "base": "172.17.0.0/16", - "size": 16 - }, - { - "base": "172.18.0.0/16", - "size": 16 - }, - { - "base": "172.19.0.0/16", - "size": 16 - }, - { - "base": "172.20.0.0/14", - "size": 16 - }, - { - "base": "172.24.0.0/14", - "size": 16 - }, - { - "base": "172.28.0.0/14", - "size": 16 - }, - { - "base": "fd57:d7e4:f221:1::/64", - "size": 64 - }, - { - "base": "fd57:d7e4:f221:2::/64", - "size": 64 - } - ] -} + "storage-driver": "overlay2" +} \ No newline at end of file