Fix perms

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

Makefile

@@ -25,7 +25,7 @@
 PROJECT_DIRECTORY := infrastructure
 CONFIG_DIRECTORY := presets
 
-CONFIGS := torrent
+CONFIGS := minecraft
 #DOCKER_PROFILES := 
 
 include DockerCompose.mk

README.md

@@ -266,6 +266,8 @@ You can change the homepage config in these files:
 
 ### Forgejo
 
+For Forgejo installation, you must change the password(s) and user in [forgejo_db.env](infrastructure/services/forgejo/env/forgejo_db.env) file and [forgejo.env](infrastructure/services/forgejo/env/forgejo.env) file.
+
 Once the installation is complete, you need to set the installation lock:
 
 ```sh
@@ -367,6 +369,7 @@ ssh -p 2222 admin@bensuperpc.org
 - [Fix docker volume](https://pratikpc.medium.com/use-docker-compose-named-volumes-as-non-root-within-your-containers-1911eb30f731)
 - [Forgejo-runner](https://code.forgejo.org/forgejo/runner)
 - [Forgejo-runner](https://huijzer.xyz/posts/55)
+- [Forgejo](https://nickcunningh.am/blog/how-to-setup-and-configure-forgejo-with-support-for-forgejo-actions-and-more)
 
 ## License
 

infrastructure/services/dufs/docker-compose.dufs.yml

@@ -5,7 +5,7 @@ services:
     container_name: dufs
     profiles:
       - dufs
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     restart: on-failure:5
     depends_on:
       - caddy

infrastructure/services/forgejo/docker-compose.forgejo.yml

@@ -1,7 +1,7 @@
 services:
   # forgejo
   forgejo:
-    image: codeberg.org/forgejo/forgejo:13-rootless
+    image: codeberg.org/forgejo/forgejo:13
     container_name: forgejo
     profiles:
       - forgejo
@@ -14,13 +14,12 @@ services:
     env_file:
       - ./env/forgejo.env
     volumes:
-      - forgejo_data:/var/lib/gitea
-      - forgejo_config:/etc/gitea
+      - forgejo_data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
       - infra-network
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     security_opt:
       - no-new-privileges:true
   
@@ -73,7 +72,7 @@ services:
     container_name: 'forgejo_runner'
     env_file:
       - ./env/forgejo_runner.env
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     volumes:
 #      - ./config/forgejo_runner/config.yaml:/config.yaml:ro
       - forgejo_runner:/data
@@ -86,8 +85,6 @@ services:
 volumes:
   forgejo_data:
     name: forgejo_data
-  forgejo_config:
-    name: forgejo_config
   forgejo_db:
     name: forgejo_db
   forgejo_certs:

infrastructure/services/openssh/docker-compose.openssh.yml

@@ -31,7 +31,6 @@ services:
       - minecraft_proxy_data:/minecraft_proxy_data:rw
       - minecraft_rcon_data:/minecraft_rcon_data:rw
       - forgejo_data:/forgejo_data:rw
-      - forgejo_config:/forgejo_config:rw
       - forgejo_db:/forgejo_db:rw
       - teamfortress2_backup:/teamfortress2_backup:rw
       - teamfortress2_data:/teamfortress2_data:rw
@@ -88,7 +87,5 @@ volumes:
 # forgejo
   forgejo_data:
     name: forgejo_data
-  forgejo_config:
-    name: forgejo_config
   forgejo_db:
     name: forgejo_db

infrastructure/services/psitransfer/docker-compose.psitransfer.yml

@@ -6,7 +6,7 @@ services:
     profiles:
       - psitransfer
     restart: on-failure:5
-    user: ${PUID:-1000}:${PGID:-1000} 
+#    user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       - caddy
     env_file:

presets/7dtd.conf

@@ -1 +1,2 @@
 DOCKER_PROFILES += 7daystodie_server 7daystodie_backup
+DOCKER_PROFILES += openssh

presets/minecraft.conf

@@ -1 +1,2 @@
 DOCKER_PROFILES += minecraft_server minecraft_backup
+DOCKER_PROFILES += openssh

presets/utils.conf

@@ -1,3 +1,3 @@
 DOCKER_PROFILES += main_infrastructure caddy homepage
 DOCKER_PROFILES += it-tools omni-tools cyberchef
-DOCKER_PROFILES += qbittorrent
+DOCKER_PROFILES += qbittorrent openssh

tools/docker_volumes_export.sh

@@ -42,8 +42,7 @@ volumes=(
     psitransfer_data
     jellyfin_config
     picoshare_data
-    forgejo_data
-    forgejo_config
+    forgejo_data    
     forgejo_db
     forgejo_certs
     forgejo_runner