Compare commits
No commits in common. "88a0d19062b5d608cba9529254d2630913b28282" and "71d4f2c4beaf7ab16f8dd2bd9ad34e0d1fa78051" have entirely different histories.
88a0d19062
...
71d4f2c4be
|
@ -1,6 +1,5 @@
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
listen [::]:80;
|
|
||||||
|
|
||||||
return 301 https://$host$request_uri;
|
return 301 https://$host$request_uri;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
listen [::]:443 ssl;
|
|
||||||
|
|
||||||
http2 on;
|
http2 on;
|
||||||
|
|
||||||
|
|
2
setup.sh
2
setup.sh
|
@ -107,7 +107,7 @@ function write_config()
|
||||||
env "${new_vars[@]}" envsubst "$vars" < "$src" > "$temp" || { rm -f "$temp"; exit 1; }
|
env "${new_vars[@]}" envsubst "$vars" < "$src" > "$temp" || { rm -f "$temp"; exit 1; }
|
||||||
chmod "$mode" "$temp" || { rm -f "$temp"; exit 1; }
|
chmod "$mode" "$temp" || { rm -f "$temp"; exit 1; }
|
||||||
chown "$owner" "$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
|
return 0
|
||||||
fi
|
fi
|
||||||
if diff -u --label="expanded $src" "$temp" "$dest"; then
|
if diff -u --label="expanded $src" "$temp" "$dest"; then
|
||||||
|
|
|
@ -1,41 +1,3 @@
|
||||||
{
|
{
|
||||||
"storage-driver": "overlay2",
|
"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
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue