Cargo.toml

@@ -11,7 +11,6 @@ codegen-units = 1
 [dependencies]
 actix-web = "4.10"
 argon2 = { version = "0.5.3", features = ["std"] }
-clap = { version = "4.5.37", features = ["derive"] }
 futures = "0.3"
 regex = "1.11"
 serde = { version = "1.0", features = ["derive"] }

Dockerfile

@@ -1,19 +0,0 @@
-FROM debian:12
-
-RUN apt update && apt install libssl3 && rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/*
-
-COPY target/release/backend /usr/bin/gorb-backend
-
-COPY entrypoint.sh /usr/bin/entrypoint.sh
-
-RUN useradd --create-home --home-dir /gorb gorb
-
-USER gorb
-
-ENV DATABASE_USERNAME="gorb"
-ENV DATABASE_PASSWORD="gorb"
-ENV DATABASE="gorb"
-ENV DATABASE_HOST="localhost"
-ENV DATABASE_PORT="5432"
-
-ENTRYPOINT ["/usr/bin/entrypoint.sh"]

compose.yml

@@ -1,33 +0,0 @@
-version: '3.5'
-volumes:
-  gorb-backend:
-  gorb-database:
-networks:
-  gorb:
-services:
-  backend:
-    image: gorb/backend:latest
-    restart: always
-    ports:
-      - 8080:8080
-    networks:
-      - gorb
-    volumes:
-      - gorb-backend:/gorb
-    environment:
-      - DATABASE_USERNAME=gorb
-      - DATABASE_PASSWORD=gorb
-      - DATABASE=gorb
-      - DATABASE_HOST=database
-      - DATABASE_PORT=5432
-  database:
-    image: postgres:16
-    restart: always
-    networks:
-      - gorb
-    volumes:
-      - gorb-database:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER=gorb
-      - POSTGRES_PASSWORD=gorb
-      - POSTGRES_DB=gorb

entrypoint.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-if [ ! -d "/gorb/config" ]; then
-    mkdir /gorb/config
-fi
-
-if [ ! -d "/gorb/logs" ]; then
-    mkdir /gorb/logs
-fi
-
-if [ ! -f "/gorb/config/config.toml" ]; then
-cat > /gorb/config/config.toml <<EOF
-[database]
-username = "${DATABASE_USERNAME}"
-password = "${DATABASE_PASSWORD}"
-database = "${DATABASE}"
-host = "${DATABASE_HOST}"
-port = ${DATABASE_PORT}
-EOF
-fi
-
-rotate_log() {
-  LOGFILE="$1"
-  BASENAME=$(basename "$LOGFILE" .log)
-  DIRNAME=$(dirname "$LOGFILE")
-
-  if [ -f "$LOGFILE" ]; then
-    # Find the next available number
-    i=1
-    while [ -f "$DIRNAME/${BASENAME}.${i}.log.gz" ]; do
-      i=$((i + 1))
-    done
-
-    gzip "$LOGFILE"
-    mv "${LOGFILE}.gz" "$DIRNAME/${BASENAME}.${i}.log.gz"
-  fi
-}
-
-rotate_log "/gorb/logs/stdout.log"
-rotate_log "/gorb/logs/stderr.log"
-
-/usr/bin/gorb-backend --config /gorb/config/config.toml  > /gorb/logs/stdout.log 2> /gorb/logs/stderr.log

src/config.rs

@@ -26,8 +26,8 @@ struct WebBuilder {
 }
 
 impl ConfigBuilder {
-    pub async fn load(path: String) -> Result<Self, Error> {
+    pub async fn load() -> Result<Self, Error> {
-        let raw = read_to_string(path).await?;
+        let raw = read_to_string("./config.toml").await?;
 
         let config = toml::from_str(&raw)?;
 
@@ -39,11 +39,13 @@ impl ConfigBuilder {
             Web {
                 url: web.url.unwrap_or(String::from("0.0.0.0")),
                 port: web.port.unwrap_or(8080),
+                ssl: web.ssl.unwrap_or_default(),
             }
         } else {
             Web {
                 url: String::from("0.0.0.0"),
                 port: 8080,
+                ssl: false,
             }
         };
 
@@ -64,6 +66,7 @@ pub struct Config {
 pub struct Web {
     pub url: String,
     pub port: u16,
+    pub ssl: bool,
 }
 
 impl Database {

src/main.rs

@@ -1,6 +1,5 @@
 use actix_web::{App, HttpServer, web};
 use argon2::Argon2;
-use clap::Parser;
 use sqlx::{PgPool, Pool, Postgres};
 use std::time::SystemTime;
 mod config;
@@ -9,14 +8,6 @@ mod api;
 
 type Error = Box<dyn std::error::Error>;
 
-/// Simple program to greet a person
-#[derive(Parser, Debug)]
-#[command(version, about, long_about = None)]
-struct Args {
-    #[arg(short, long, default_value_t = String::from("/etc/gorb/config.toml"))]
-    config: String,
-}
-
 #[derive(Clone)]
 struct Data {
     pub pool: Pool<Postgres>,
@@ -27,9 +18,7 @@ struct Data {
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    let args = Args::parse();
+    let config = ConfigBuilder::load().await?.build();
-
-    let config = ConfigBuilder::load(args.config).await?.build();
 
     let web = config.web.clone();