nathanwoodburn/hnshosting-wp
nathanwoodburn/hnshosting-wp
1
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Merge branch 'develop' into main
All checks were successful
Build Docker / Build Bot (push) Successful in 21s
Details
Build Docker / Build Master (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Nathan Woodburn 2023-08-24 18:36:46 +10:00
commit 0383b47b8e
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitea/workflows/build.yml
View File

@ -25,7 +25,7 @@ jobs:
echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
tag=${tag//\//-} tag=${tag//\//-}
if [ tag = "main" ]; then if [[ "$tag" == "main" ]]; then
tag="latest" tag="latest"
else else
tag_num="${tag}-${tag_num}" tag_num="${tag}-${tag_num}"
@ -64,7 +64,7 @@ jobs:
echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
tag=${tag//\//-} tag=${tag//\//-}
if [ tag = "main" ]; then if [[ "$tag" == "main" ]]; then
tag="latest" tag="latest"
else else
tag_num="${tag}-${tag_num}" tag_num="${tag}-${tag_num}"

4
worker/main.py
View File

@ -26,7 +26,7 @@ def new_site():
sites_file.close() sites_file.close()
# New site in background # New site in background
thread = threading.Thread(target=new_site, args=(domain)) thread = threading.Thread(target=new_site_script, args=(domain,))
thread.start() thread.start()
@ -93,7 +93,7 @@ def site_exists(domain):
else: else:
return False return False
def new_site(domain): def new_site_script(domain):
script = 'bash wp.sh ' + domain script = 'bash wp.sh ' + domain
os.system(script) os.system(script)

4
worker/wp.sh
View File

@ -73,7 +73,7 @@ printf "server {
server_name $DOMAIN *.$DOMAIN; server_name $DOMAIN *.$DOMAIN;
proxy_ssl_server_name on; proxy_ssl_server_name on;
location / { location / {
proxy_set_header Accept-Encoding ""; proxy_set_header Accept-Encoding \"\";
proxy_set_header X-Real-IP \$remote_addr; proxy_set_header X-Real-IP \$remote_addr;
proxy_set_header Host \$http_host; proxy_set_header Host \$http_host;
proxy_set_header X-Forwarded-Host \$http_host; proxy_set_header X-Forwarded-Host \$http_host;
@ -81,7 +81,7 @@ printf "server {
proxy_set_header X-Forwarded-Proto \$scheme; proxy_set_header X-Forwarded-Proto \$scheme;
proxy_pass $URL; proxy_pass $URL;
sub_filter '</body>' '<script src="https://nathan.woodburn/https.js"></script></body>'; sub_filter '</body>' '<script src=\"https://nathan.woodburn/https.js\"></script></body>';
sub_filter_once on; sub_filter_once on;
} }