diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 3e27842..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -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/server/Cargo.lock b/server/Cargo.lock index 6b56474..2ff6a21 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -880,9 +880,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" dependencies = [ "bitflags", "bytes", diff --git a/server/Cargo.toml b/server/Cargo.toml index 9a2ec11..04bd4ed 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -8,7 +8,7 @@ tokio = { version = "1", features = ["full"] } axum = { version = "0.8.9", features = ["tokio", "http2"] } axum-server = { version = "0.8.0", features = ["tls-rustls"] } tower = "0.5.3" -tower-http = { version = "0.6.8", features = ["fs", "cors", "trace"] } +tower-http = { version = "0.6.10", features = ["fs", "cors", "trace"] } rustls = "0.23" rustls-pemfile = "2" serde = { version = "1", features = ["derive"] } diff --git a/website/api/teams.json b/website/api/teams.json index 6d2ba90..0f045e9 100644 --- a/website/api/teams.json +++ b/website/api/teams.json @@ -38,8 +38,9 @@ "acronym": "", "leader": "Liwitikiwi", "vips": "", - "description": "Build borders to keep out hostiles. A safespace for builders.", - "image": "outpost.png" + "description": "Ardubia is a peaceful nation in the valleys around of the Ardubian mountains. We want to make Ardubia safe, so regular players can't get jumped when being in the open and builders can contribute to our towns without getting griefed.", + "image": "ardubeo.png", + "discord": "directs/ardubia" }, { "title": "Pact of Peace and Neutrality", diff --git a/website/assets/ardubeo.png b/website/assets/ardubeo.png new file mode 100644 index 0000000..576654e Binary files /dev/null and b/website/assets/ardubeo.png differ diff --git a/website/assets/firetower.png b/website/assets/firetower.png new file mode 100644 index 0000000..48d5b94 Binary files /dev/null and b/website/assets/firetower.png differ diff --git a/website/directs/ardubia b/website/directs/ardubia new file mode 100644 index 0000000..582f64b --- /dev/null +++ b/website/directs/ardubia @@ -0,0 +1 @@ +https://discord.gg/UcSuDwsR8k