diff --git a/.gitignore b/.gitignore index 8c4ee38..b86aff8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,3 @@ **.jsonl **.ignore.** snapshot* -cert.pem -key.pem diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3e27842 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ +services: + app: + image: "jc21/nginx-proxy-manager:latest" + restart: unless-stopped + + ports: + - "80:80" + - "443:443" + - "81:81" + + environment: + TZ: "Australia/Brisbane" + + volumes: + - ./data:/data + - ./letsencrypt:/etc/letsencrypt diff --git a/rust-web.service b/rust-web.service new file mode 100644 index 0000000..d52f71e --- /dev/null +++ b/rust-web.service @@ -0,0 +1,13 @@ +[Unit] +Description=Webserver +After=network.target + +[Service] +Type=simple +User=root +WorkingDirectory=/root/Anarchyphase-Website/server +ExecStart=/usr/bin/cargo run +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/server/src/main.rs b/server/src/main.rs index 23b9a6a..74cd573 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -6,7 +6,6 @@ use axum::{ response::{IntoResponse, Response}, routing::get, }; -use axum_server::tls_rustls::RustlsConfig; use std::net::SocketAddr; use std::path::PathBuf; use tokio::fs; @@ -91,11 +90,6 @@ async fn main() { axum::serve(listener, http_app).await.unwrap(); }); - // HTTPS on port 443 - let certs_dir = website_root.join("certs"); - let cert_path = certs_dir.join("cert.pem"); - let key_path = certs_dir.join("key.pem"); - http_handle.await.unwrap(); } diff --git a/setup.sh b/setup.sh new file mode 100644 index 0000000..26aae23 --- /dev/null +++ b/setup.sh @@ -0,0 +1 @@ +sudo bash -c "apt update && apt install -y build-essential curl pkg-config libssl-dev && apt install cargo && apt update && apt upgrade -y && apt install docker.io docker-compose && systemctl enable --now docker && systemctl disable --now nginx && cd /root/Anarchyphase-Website && docker-compose up -d && ufw allow 81" diff --git a/website/api/posts.json b/website/api/posts.json index f26d1e6..c2944cf 100644 --- a/website/api/posts.json +++ b/website/api/posts.json @@ -20,7 +20,7 @@ { "date": "2026-04-21, by AlexEmmet", - "head_img": "horse_rainbow.png", + "head_img": "village_sunset.png", "file": "Home.md", "title": "The /Home command", @@ -29,7 +29,7 @@ { "date": "2026-04-21, by AlexEmmet", - "head_img": "horse_rainbow.png", + "head_img": "village_sunset.png", "file": "ThisWebsite.md", "title": "About This Website", @@ -38,10 +38,10 @@ { "date": "2026-04-21, by AlexEmmet", - "head_img": "horse_rainbow.png", + "head_img": "village_sunset.png", "file": "AlexsOpinion.md", "title": "Alex's Opinion", - "description": "The Anarchyphase balance Changes" + "description": "The Anarchyphase balance Changes." } ] diff --git a/website/api/staff.json b/website/api/staff.json index cdc7a17..30699a1 100644 --- a/website/api/staff.json +++ b/website/api/staff.json @@ -2,54 +2,56 @@ { "icon": "morice.png", "name": "MoriceMC", - "priority": 0, "role": "Owner & Lead Developer" }, { "icon": "ninivx.png", "name": "NiniVX", - "priority": 1, "role": "Community Manager" }, { "icon": "burrata.png", "name": "Burrata", - "priority": 1, "role": "Administrator" }, { "icon": "pitrex.png", "name": "Pitrex", - "priority": 2, "role": "Moderator & Developer" }, + { + "icon": "cashius_to.png", + "name": "T1X", + "role": "Moderator (Yellow Bomb Guy)" + }, { "icon": "litus.png", "name": "Litus", - "priority": 2, "role": "Moderator" }, { "icon": "ahnyokatzin.png", "name": "Ahnyokatzin", - "priority": 2, - "role": "Moderator" - }, - { - "name": "T1X", - "priority": 2, "role": "Moderator" }, { "icon": "harrpyrose.png", "name": "Harrpy", - "priority": 2, "role": "Moderator" }, { "icon": "alexemmet.png", "name": "AlexEmmet", - "priority": 3, "role": "Web-Developer & Critic (Professional Hater)" + }, + { + "icon": "xlagging.png", + "name": "xLagging", + "role": "Moderator & Developer" + }, + { + "icon": "mewjo_.png", + "name": "Mewjo_", + "role": "Moderator" } ] diff --git a/website/api/teams.json b/website/api/teams.json index ed3412c..6d2ba90 100644 --- a/website/api/teams.json +++ b/website/api/teams.json @@ -21,7 +21,7 @@ "acronym": "", "leader": "Yippee", "vips": "Skely, xLeggings, Luxi", - "description": "Me when I Orb it", + "description": "Me when I Orb it.", "image": "village_sunset.png" }, { @@ -29,7 +29,7 @@ "acronym": "CT", "leader": "MoriceMC", "vips": "Yeah he's the owner", - "description": "We are number one", + "description": "We are number one!", "image": "icon.png", "discord": "directs/ct" }, @@ -38,7 +38,7 @@ "acronym": "", "leader": "Liwitikiwi", "vips": "", - "description": "Build borders to keep out foreign aliens", + "description": "Build borders to keep out hostiles. A safespace for builders.", "image": "outpost.png" }, { @@ -46,7 +46,7 @@ "acronym": "PPN", "leader": "Hamb_y", "vips": "", - "description": "Pact of Peace and neutrality lets anyone join no matter their team. Our goal is to promote peace within factions on the server", + "description": "Pact of Peace and neutrality lets anyone join no matter their team. Our goal is to promote peace within factions on the server!", "image": "mountain.png", "discord": "directs/pact" } diff --git a/website/app.js b/website/app.js index b62fd8c..5061362 100644 --- a/website/app.js +++ b/website/app.js @@ -129,7 +129,6 @@ async function loadStaff() { try { const response = await fetch("/api/staff.json"); const staff = await response.json(); - staff.sort((a, b) => a.priority - b.priority); const container = document.getElementById("staff-grid"); if (!container) return; diff --git a/website/assets/cashius_to.png b/website/assets/cashius_to.png new file mode 100644 index 0000000..7449f28 Binary files /dev/null and b/website/assets/cashius_to.png differ diff --git a/website/assets/mewjo_.png b/website/assets/mewjo_.png new file mode 100644 index 0000000..a599c25 Binary files /dev/null and b/website/assets/mewjo_.png differ diff --git a/website/assets/xlagging.png b/website/assets/xlagging.png new file mode 100644 index 0000000..ca4dbdd Binary files /dev/null and b/website/assets/xlagging.png differ