4 Commits

Author SHA1 Message Date
7729ea62b3 Merge branch 'develop' into main
All checks were successful
Build Docker / Build Master (push) Successful in 24s
Build Docker / Build Bot (push) Successful in 23s
Build Docker for Release / Build Master (push) Successful in 35s
Build Docker for Release / Build Bot (push) Successful in 34s
2023-08-25 18:26:43 +10:00
fca523f013 Revert "actions: Fix branch rule"
All checks were successful
Build Docker / Build Master (push) Successful in 28s
Build Docker / Build Bot (push) Successful in 27s
This reverts commit 4482f85ded.
2023-08-25 15:59:08 +10:00
4482f85ded actions: Fix branch rule 2023-08-25 15:54:58 +10:00
cd598cce47 Merge branch 'develop' into main 2023-08-25 15:54:41 +10:00
5 changed files with 31 additions and 73 deletions

View File

@@ -1,7 +0,0 @@
html {
background-color: black;
color: white;
font-family: 'Roboto', sans-serif;
font-size: 16px;
text-align: center;
}

View File

@@ -1,4 +1,4 @@
from flask import Flask, make_response, redirect, request, jsonify, render_template, send_from_directory
from flask import Flask, make_response, redirect, request, jsonify
import dotenv
import os
import requests
@@ -459,15 +459,34 @@ def home():
pass
# Create html page
workerhtml = ""
html = "<h1>Welcome</h1><br>"
html += "<h2>Create a site</h2>"
html += "<form action='/add-site' method='POST'>"
html += "<p>Domain: <input type='text' name='domain'></p>"
html += "<p>Licence key: <input type='text' name='licence'></p>"
html += "<input type='submit' value='Create site'>"
html += "</form>"
html += "<br><h2>Stats</h2><br>"
html += "<h2>Workers</h2>"
html += "<p>Number of workers: " + str(len(workers)) + "</p>"
html += "<p>Workers:</p>"
html += "<ul>"
for worker in workers:
workerhtml += "<li>Name: " + worker.split(':')[0] + " | IP: " + worker.split(':')[2].strip('\n') + "</li>"
sitehtml = ""
html += "<li>Name: " + worker.split(':')[0] + " | IP " + worker.split(':')[2].strip('\n') + "</li>"
html += "</ul>"
html += "<h2>Sites</h2>"
html += "<p>Number of sites: " + str(len(sites)) + "</p>"
html += "<p>Sites:</p>"
html += "<ul>"
for site in sites:
sitehtml += "<li>Domain: <a href=\"https://" + site.split(':')[0] + "\" target=\"_blank\">"+site.split(':')[0]+"</a> | Worker: " + site.split(':')[1].strip('\n') + "</li>"
html += "<li>Domain: " + site.split(':')[0] + " | Worker: " + site.split(':')[1].strip('\n') + "</li>"
html += "</ul>"
html += "<h2>Licences</h2>"
html += "<p>Number of licences: " + str(len(licences)) + "</p>"
return render_template('index.html', workers=workerhtml, site_count = str(len(sites)), sites = sitehtml, licences = str(len(licences)))
html += "<h2><a href='/admin'>Admin</a></h2>"
return html
# Admin page
@app.route('/admin')
@@ -761,10 +780,7 @@ def login():
def failed_login():
return "<h1>Failed login</h1><br><form action='/login' method='POST'><input type='password' name='password'><input type='submit' value='Login'></form>"
# Assets
@app.route('/assets/<path:path>')
def send_report(path):
return send_from_directory('assets', path)

View File

@@ -1,34 +0,0 @@
<!DOCTYPE html>
<html lang="en-au">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>HNS Hosting Wordpress</title>
<link rel="stylesheet" href="/assets/css/index.css">
</head>
<body>
<h1>HNS Hosting Wordpress</h1>
<p>Intro blurb</p>
<br>
<div id="new">
<h2>Create a new site</h2>
<form action='/add-site' method='POST'>
<p>Domain: <input type='text' name='domain'></p>
<p>Licence key: <input type='text' name='licence'></p>
</form>
</div>
<br>
<div id="stats">
<h2>Stats</h2>
<h3>Workers</h3>
<ul>{{workers}}</ul>
<h3>Sites</h3>
<p>Total sites: {{site_count}}</p>
<ul>{{sites}}</ul>
<br>
<h3>Unclaimed licences: {{licences}}</h3>
</div>
<br>
<h2><a href="/admin">Admin</a></h2>
</body>
</html>

View File

@@ -24,21 +24,6 @@ python3 -m pip install -r requirements.txt
cp .env.example .env
chmod +x wp.sh tlsa.sh
# Add proxy to docker
mkdir ~/.docker
echo """{
\"proxies\": {
\"default\": {
\"httpProxy\": \"http://proxy.hnsproxy.au:80\",
\"httpsProxy\": \"https://proxy.hnsproxy.au:443\",
\"noProxy\": \"localhost\"
}
}
}""" > ~/.docker/config.json
# Restart docker
sudo systemctl restart docker
# Pull docker images to save time later
docker pull mysql:5.7 &
docker pull wordpress:latest &

View File

@@ -56,11 +56,9 @@ services:
WORDPRESS_DB_PASSWORD: $MYSQL_PASSWORD
WORDPRESS_DB_NAME: WordPressDatabase
volumes:
- data:/var/www/html
[\"./:/var/www/html\"]
volumes:
mysql:
data:
mysql: {}
""" > docker-compose.yml
# Start the containers