From b31b978c5a0d8220454a4a46f005b85f7c4d3f93 Mon Sep 17 00:00:00 2001
From: Aravinth Manivannan <realaravinth@batsense.net>
Date: Mon, 2 Oct 2023 12:54:11 +0530
Subject: [PATCH] feat & fix: use UID=1001 to match atm@lab.batsense.net and
 listen on 80

---
 targets/forgejo/conf/app.ini       | 4 ++--
 targets/forgejo/docker-compose.yml | 5 ++---
 targets/forgejo/ftest.toml         | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/targets/forgejo/conf/app.ini b/targets/forgejo/conf/app.ini
index 0cd8fe0..ed2391b 100644
--- a/targets/forgejo/conf/app.ini
+++ b/targets/forgejo/conf/app.ini
@@ -16,8 +16,8 @@ TEMP_PATH = /data/gitea/uploads
 APP_DATA_PATH = /data/gitea
 DOMAIN = forgejo
 SSH_DOMAIN = localhost
-HTTP_PORT = 7000
-ROOT_URL = http://forgejo:7000/
+HTTP_PORT = 80
+ROOT_URL = http://forgejo:80/
 DISABLE_SSH = false
 SSH_PORT = 22
 SSH_LISTEN_PORT = 22
diff --git a/targets/forgejo/docker-compose.yml b/targets/forgejo/docker-compose.yml
index f51ad90..3f94006 100644
--- a/targets/forgejo/docker-compose.yml
+++ b/targets/forgejo/docker-compose.yml
@@ -5,8 +5,7 @@ services:
     image: codeberg.org/forgejo/forgejo:1.20
     container_name: forgejo
     environment:
-      - USER_UID=1000
-      - USER_GID=1000
+      - USER_UID=1001
     restart: always
     networks:
       - ftest
@@ -16,7 +15,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - ./conf/app.ini:/data/gitea/conf/app.ini:wo
     ports:
-      - "7000:7000"
+      - "7000:80"
       - "2222:22"
 
 networks:
diff --git a/targets/forgejo/ftest.toml b/targets/forgejo/ftest.toml
index 352efac..b4cb996 100644
--- a/targets/forgejo/ftest.toml
+++ b/targets/forgejo/ftest.toml
@@ -2,13 +2,13 @@ version = "0.1.0"
 name = "forgejo"
 homepage = "https://forgejo.org"
 repository = "https://codeberg.org/forgejo/forgejo"
-container_host = "http://forgejo:7000"
+container_host = "http://forgejo"
 [[init_scripts]]
 name = "forgejo-init-script"
 url = "https://git.batsense.net/ForgeFlux/forgejo-init-script"
 version = "0.1.0"
 container = "forgeflux/forgejo-init-script"
-env_vars = { FORGEJO_URL="http://forgejo:7000", FORGEJO_SSH_URL="ssh://git@forgejo:2222" }
+env_vars = { FORGEJO_URL="http://forgejo", FORGEJO_SSH_URL="ssh://git@forgejo:2222" }
 
 [[suites]]
 name = "forge_federation"
@@ -19,7 +19,7 @@ name = "webfinger"
 url = "https://git.batsense.net/ForgeFlux/webfinger-test"
 version = "0.1.0"
 container = "forgeflux/webfinger-test"
-env_vars = { FTEST_USER="alice@forgejo:7000"}
+env_vars = { FTEST_USER="alice@forgejo"}
 [[suites.tests]]
 name = "nodeinfo"
 url = "https://git.batsense.net/ForgeFlux/nodeinfo-test"