fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 15s
Deploy Dev / Push (pull_request) Successful in 14s
Deploy Dev / prepare (pull_request) Successful in 4s
Deploy Dev / Deploy dev (pull_request) Successful in 21s
Deploy Prod / Build (pull_request) Successful in 14s
Deploy Prod / Push (pull_request) Successful in 15s
Deploy Prod / prepare (pull_request) Successful in 7s
Deploy Prod / Deploy prod (pull_request) Successful in 34s
All checks were successful
Deploy Dev / Build (pull_request) Successful in 15s
Deploy Dev / Push (pull_request) Successful in 14s
Deploy Dev / prepare (pull_request) Successful in 4s
Deploy Dev / Deploy dev (pull_request) Successful in 21s
Deploy Prod / Build (pull_request) Successful in 14s
Deploy Prod / Push (pull_request) Successful in 15s
Deploy Prod / prepare (pull_request) Successful in 7s
Deploy Prod / Deploy prod (pull_request) Successful in 34s
This commit is contained in:
parent
e174ff26c4
commit
861327a017
15
nginx copy/nginx-dev/Dockerfile
Normal file
15
nginx copy/nginx-dev/Dockerfile
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
FROM nginx
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install certbot --yes
|
||||||
|
RUN apt-get install python3-certbot-nginx python3-pip --yes
|
||||||
|
RUN pip3 install --break-system-packages minio
|
||||||
|
COPY ./config /etc/nginx
|
||||||
|
COPY ./fullchain.pem /etc/nginx/fullchain.pem
|
||||||
|
COPY ./privkey.pem /etc/nginx/privkey.pem
|
||||||
|
COPY prepare.py prepare.py
|
||||||
|
COPY run.sh run.sh
|
||||||
|
COPY refre.sh refre.sh
|
||||||
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
RUN chmod 777 run.sh
|
||||||
|
RUN chmod 777 refre.sh
|
||||||
|
ENTRYPOINT ["./run.sh"]
|
24
nginx copy/nginx-dev/config/nginx.conf
Normal file
24
nginx copy/nginx-dev/config/nginx.conf
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
events {}
|
||||||
|
|
||||||
|
http {
|
||||||
|
client_max_body_size 50m;
|
||||||
|
|
||||||
|
map $http_upgrade $connection_upgrade {
|
||||||
|
default upgrade;
|
||||||
|
'' close;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name *.develop.sprinthub.ru;
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name *.dev.chocomarsh.com;
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
include ./hosts.conf;
|
||||||
|
}
|
82
nginx copy/nginx-dev/prepare.py
Normal file
82
nginx copy/nginx-dev/prepare.py
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from minio import Minio
|
||||||
|
from urllib.request import urlopen
|
||||||
|
from json import loads
|
||||||
|
|
||||||
|
|
||||||
|
minio_client = Minio(
|
||||||
|
"minio.develop.sprinthub.ru:9000",
|
||||||
|
access_key="serviceminioadmin",
|
||||||
|
secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
|
||||||
|
secure=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get(url):
|
||||||
|
with urlopen(url) as response:
|
||||||
|
data = response.read().decode("utf-8")
|
||||||
|
return loads(data)
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = get(
|
||||||
|
"http://configurator/api/v1/fetch?project=certupdater&stage=development"
|
||||||
|
)
|
||||||
|
hosts = response["configs"]["hosts"]
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error fetching config: {e}", file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
config = ""
|
||||||
|
for host, params in hosts.items():
|
||||||
|
config += """
|
||||||
|
server {{
|
||||||
|
listen 443 ssl http2;
|
||||||
|
listen [::]:443 ssl http2;
|
||||||
|
server_name {host};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/{host}/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/{host}/privkey.pem;
|
||||||
|
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
|
add_header X-XSS-Protection "1; mode=block" always;
|
||||||
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
|
add_header Referrer-Policy "no-refferer-when-downgrade" always;
|
||||||
|
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
|
||||||
|
|
||||||
|
location / {{
|
||||||
|
resolver 127.0.0.11;
|
||||||
|
proxy_pass http://{target_host}:{port}$request_uri;
|
||||||
|
}}
|
||||||
|
}}\n\n
|
||||||
|
""".format(
|
||||||
|
host=host, target_host=params["host"], port=params["port"]
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
fullchain = minio_client.get_object(
|
||||||
|
"certupdater", f"certificates/{host}/fullchain.pem"
|
||||||
|
)
|
||||||
|
privkey = minio_client.get_object(
|
||||||
|
"certupdater", f"certificates/{host}/privkey.pem"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
os.makedirs(f"/etc/nginx/{host}", exist_ok=True)
|
||||||
|
except OSError as e:
|
||||||
|
print(f"Error creating directory: {e}", file=sys.stderr)
|
||||||
|
continue
|
||||||
|
|
||||||
|
with open(f"/etc/nginx/{host}/fullchain.pem", "wb") as fp:
|
||||||
|
fp.write(fullchain.data)
|
||||||
|
with open(f"/etc/nginx/{host}/privkey.pem", "wb") as fp:
|
||||||
|
fp.write(privkey.data)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error processing host {host}: {e}", file=sys.stderr)
|
||||||
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open("/etc/nginx/hosts.conf", "w") as fp:
|
||||||
|
fp.write(config)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error writing config file: {e}", file=sys.stderr)
|
||||||
|
sys.exit(1)
|
11
nginx copy/nginx-dev/refre.sh
Normal file
11
nginx copy/nginx-dev/refre.sh
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if ! python3 prepare.py; then
|
||||||
|
echo "Error running prepare.py" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! nginx -s reload; then
|
||||||
|
echo "Error reloading nginx" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
4
nginx copy/nginx-dev/run.sh
Normal file
4
nginx copy/nginx-dev/run.sh
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
python3 prepare.py
|
||||||
|
/docker-entrypoint.sh nginx -g 'daemon off;'
|
15
nginx copy/nginx-prod/Dockerfile
Normal file
15
nginx copy/nginx-prod/Dockerfile
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
FROM nginx
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install certbot --yes
|
||||||
|
RUN apt-get install python3-certbot-nginx python3-pip --yes
|
||||||
|
RUN pip3 install --break-system-packages minio
|
||||||
|
COPY ./config /etc/nginx
|
||||||
|
COPY ./fullchain.pem /etc/nginx/fullchain.pem
|
||||||
|
COPY ./privkey.pem /etc/nginx/privkey.pem
|
||||||
|
COPY prepare.py prepare.py
|
||||||
|
COPY run.sh run.sh
|
||||||
|
COPY refre.sh refre.sh
|
||||||
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
RUN chmod 777 run.sh
|
||||||
|
RUN chmod 777 refre.sh
|
||||||
|
ENTRYPOINT ["./run.sh"]
|
24
nginx copy/nginx-prod/config/nginx.conf
Normal file
24
nginx copy/nginx-prod/config/nginx.conf
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
events {}
|
||||||
|
|
||||||
|
http {
|
||||||
|
client_max_body_size 50m;
|
||||||
|
|
||||||
|
map $http_upgrade $connection_upgrade {
|
||||||
|
default upgrade;
|
||||||
|
'' close;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name *.sprinthub.ru;
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name *.chocomarsh.com;
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
include ./hosts.conf;
|
||||||
|
}
|
82
nginx copy/nginx-prod/prepare.py
Normal file
82
nginx copy/nginx-prod/prepare.py
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from minio import Minio
|
||||||
|
from urllib.request import urlopen
|
||||||
|
from json import loads
|
||||||
|
|
||||||
|
|
||||||
|
minio_client = Minio(
|
||||||
|
"minio.sprinthub.ru:9000",
|
||||||
|
access_key="serviceminioadmin",
|
||||||
|
secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
|
||||||
|
secure=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get(url):
|
||||||
|
with urlopen(url) as response:
|
||||||
|
data = response.read().decode("utf-8")
|
||||||
|
return loads(data)
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = get(
|
||||||
|
"http://configurator/api/v1/fetch?project=certupdater&stage=production"
|
||||||
|
)
|
||||||
|
hosts = response["configs"]["hosts"]
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error fetching config: {e}", file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
config = ""
|
||||||
|
for host, params in hosts.items():
|
||||||
|
config += """
|
||||||
|
server {{
|
||||||
|
listen 443 ssl http2;
|
||||||
|
listen [::]:443 ssl http2;
|
||||||
|
server_name {host};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/{host}/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/{host}/privkey.pem;
|
||||||
|
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
|
add_header X-XSS-Protection "1; mode=block" always;
|
||||||
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
|
add_header Referrer-Policy "no-refferer-when-downgrade" always;
|
||||||
|
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
|
||||||
|
|
||||||
|
location / {{
|
||||||
|
resolver 127.0.0.11;
|
||||||
|
proxy_pass http://{target_host}:{port}$request_uri;
|
||||||
|
}}
|
||||||
|
}}\n\n
|
||||||
|
""".format(
|
||||||
|
host=host, target_host=params["host"], port=params["port"]
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
fullchain = minio_client.get_object(
|
||||||
|
"certupdater", f"certificates/{host}/fullchain.pem"
|
||||||
|
)
|
||||||
|
privkey = minio_client.get_object(
|
||||||
|
"certupdater", f"certificates/{host}/privkey.pem"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
os.makedirs(f"/etc/nginx/{host}", exist_ok=True)
|
||||||
|
except OSError as e:
|
||||||
|
print(f"Error creating directory: {e}", file=sys.stderr)
|
||||||
|
continue
|
||||||
|
|
||||||
|
with open(f"/etc/nginx/{host}/fullchain.pem", "wb") as fp:
|
||||||
|
fp.write(fullchain.data)
|
||||||
|
with open(f"/etc/nginx/{host}/privkey.pem", "wb") as fp:
|
||||||
|
fp.write(privkey.data)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error processing host {host}: {e}", file=sys.stderr)
|
||||||
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open("/etc/nginx/hosts.conf", "w") as fp:
|
||||||
|
fp.write(config)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error writing config file: {e}", file=sys.stderr)
|
||||||
|
sys.exit(1)
|
4
nginx copy/nginx-prod/refre.sh
Normal file
4
nginx copy/nginx-prod/refre.sh
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
python3 prepare.py
|
||||||
|
nginx -s reload
|
4
nginx copy/nginx-prod/run.sh
Normal file
4
nginx copy/nginx-prod/run.sh
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
python3 prepare.py
|
||||||
|
/docker-entrypoint.sh nginx -g 'daemon off;'
|
@ -4,8 +4,6 @@ RUN apt-get install certbot --yes
|
|||||||
RUN apt-get install python3-certbot-nginx python3-pip --yes
|
RUN apt-get install python3-certbot-nginx python3-pip --yes
|
||||||
RUN pip3 install --break-system-packages minio
|
RUN pip3 install --break-system-packages minio
|
||||||
COPY ./config /etc/nginx
|
COPY ./config /etc/nginx
|
||||||
COPY ./fullchain.pem /etc/nginx/fullchain.pem
|
|
||||||
COPY ./privkey.pem /etc/nginx/privkey.pem
|
|
||||||
COPY prepare.py prepare.py
|
COPY prepare.py prepare.py
|
||||||
COPY run.sh run.sh
|
COPY run.sh run.sh
|
||||||
COPY refre.sh refre.sh
|
COPY refre.sh refre.sh
|
||||||
|
@ -4,8 +4,6 @@ RUN apt-get install certbot --yes
|
|||||||
RUN apt-get install python3-certbot-nginx python3-pip --yes
|
RUN apt-get install python3-certbot-nginx python3-pip --yes
|
||||||
RUN pip3 install --break-system-packages minio
|
RUN pip3 install --break-system-packages minio
|
||||||
COPY ./config /etc/nginx
|
COPY ./config /etc/nginx
|
||||||
COPY ./fullchain.pem /etc/nginx/fullchain.pem
|
|
||||||
COPY ./privkey.pem /etc/nginx/privkey.pem
|
|
||||||
COPY prepare.py prepare.py
|
COPY prepare.py prepare.py
|
||||||
COPY run.sh run.sh
|
COPY run.sh run.sh
|
||||||
COPY refre.sh refre.sh
|
COPY refre.sh refre.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user