Add openSSH, fix perms volumes, improve homepage, rework makefile

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2026-09-11 19:53:42 +02:00 · 2024-09-09 21:49:42 +02:00
parent 811f6ac7bb
commit 4818e18842
20 changed files with 212 additions and 115 deletions
@@ -5,6 +5,9 @@ services:
    container_name: caddy
    profiles:
      - caddy
+    depends_on:
+      main_infrastructure:
+        condition: service_completed_successfully
    restart: on-failure:5
    ports:
      - 80:80
@@ -55,8 +58,3 @@ volumes:
    name: caddy_config
  caddy_backup:
    name: caddy_backup
-
-networks:
-  infra-network:
-    driver: bridge
-    name: infra-network
@@ -20,4 +20,6 @@ services:

 volumes:
  public_data:
-    name: public_data
+    name: public_data
+  private_data:
+    name: private_data
@@ -9,25 +9,19 @@
        description: Wordpress
        ping: wordpress.bensuperpc.org
        container: wordpress
-    - uptime-kuma:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png
-        href: https://uptimekuma.bensuperpc.org/
-        description: Uptime Kuma
-        ping: uptimekuma.bensuperpc.org
-        container: uptime-kuma
-    - yacht:
-#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/yacht.png
-        href: https://yacht.bensuperpc.org/
-        description: Yacht
-        ping: yacht.bensuperpc.org
-        container: yacht
- Sharing:
    - jellyfin:
        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/jellyfin.png
        href: https://jellyfin.bensuperpc.org/
        description: Jellyfin
        ping: jellyfin.bensuperpc.org
        container: jellyfin
+    - projectsend:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
+        href: https://projectsend.bensuperpc.org/
+        description: ProjectSend
+        ping: projectsend.bensuperpc.org
+        container: projectsend
+- Sharing:
    - psitransfer:
        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/psitransfer.png
        href: https://psitransfer.bensuperpc.org/
@@ -64,12 +58,6 @@
        description: Transmission
        ping: transmission.bensuperpc.org
        container: transmission
-    - projectsend:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
-        href: https://projectsend.bensuperpc.org/
-        description: ProjectSend
-        ping: projectsend.bensuperpc.org
-        container: projectsend
    - dufs:
 #        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dufs.png
        href: https://dufs.bensuperpc.org/
@@ -90,7 +78,6 @@
        description: StirlingPDF
        ping: stirlingpdf.bensuperpc.org
        container: stirlingpdf
-
    - gitea:
        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/gitea.png
        href: https://gitea.bensuperpc.org/
@@ -98,6 +85,26 @@
        ping: gitea.bensuperpc.org
        container: gitea

+- Admin:
+    - uptime-kuma:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png
+        href: https://uptimekuma.bensuperpc.org/
+        description: Uptime Kuma
+        ping: uptimekuma.bensuperpc.org
+        container: uptime-kuma
+    - yacht:
+#        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/yacht.png
+        href: https://yacht.bensuperpc.org/
+        description: Yacht
+        ping: yacht.bensuperpc.org
+        container: yacht
+    - adminer:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/adminer.png
+        href: https://adminer.bensuperpc.org/
+        description: Adminer
+        ping: adminer.bensuperpc.org
+        container: adminer
+
 - Games:
    - minecraft:
        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/minecraft.png
@@ -111,11 +118,4 @@
        description: 7 Days to Die server
 #        ping: 7dtd.bensuperpc.org
        container: 7dtd-server
- Others:
-    - gitea-runner:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/gitea.png
-#        href: https://gitea.bensuperpc.org/
-        description: Gitea Runner
-        ping: gitea.bensuperpc.org
-        container: gitea-runner

@@ -6,12 +6,12 @@ title: Bensuperpc

 base: https://www.bensuperpc.org

-favicon: /images/favicon.ico
+favicon: /image/favicon.ico

 logpath: /app/logs

 background: 
-  image: /images/electronic.jpg
+  image: /image/background.jpg
  blur: md
  opacity: 50
  brightness: 50
@@ -25,17 +25,13 @@ layout:
  Personal:
    style: row
    columns: 6
-  Media:
-    style: row
-    columns: 6
  Sharing:
    style: row
    columns: 6
-  Utils:
+  Admin:
    style: row
    columns: 6
-    initiallyCollapsed: false
-  Others:
+  Utils:
    style: row
    columns: 6
    initiallyCollapsed: false
@@ -1,19 +1,37 @@
 ---
 # For configuration options and examples, please see:
 # https://gethomepage.dev/latest/configs/service-widgets
+# https://gethomepage.dev/main/widgets/services/qbittorrent
+
+#- logo:
+#    icon: /image/daisy.jpg

 - resources:
    cpu: true
+    cputemp: true
    memory: true
    disk: /
+    uptime: true
+    refresh: 3000

- search:
-    provider: duckduckgo
-    target: _blank
+#- search:
+#    provider: duckduckgo
+#    target: _blank
+#    showSearchSuggestions: true

 - datetime:
    text_size: xl
    locale: fr
    format:
-        timeStyle: long
-        dateStyle: long
+        timeStyle: short
+        dateStyle: short
+
+- openmeteo:
+    label: Nantes # optional
+    latitude: 47.216671
+    longitude: -1.55
+    timezone: Europe/Paris # optional
+    units: metric # or imperial
+    cache: 5 # Time in minutes to cache API responses, to stay within limits
+    format: # optional, Intl.NumberFormat options
+      maximumFractionDigits: 1
@@ -13,7 +13,7 @@ services:
    volumes:
      - homepage_log:/app/logs
      - ./homepage/config:/app/config:ro
-      - ./homepage/image:/app/public/images:ro
+      - ./homepage/image:/app/public/image:ro
      - /var/run/docker.sock:/var/run/docker.sock:ro
    networks:
      - infra-network
@@ -15,12 +15,9 @@ services:
      - ./jellyfin/env/jellyfin.env
    volumes:
      - jellyfin_config:/config
-      - jellyfin_data_movies:/movies:rw
-      - jellyfin_data_series:/series:rw
-      - jellyfin_data_documentaries:/documentaries:rw
-      - jellyfin_data_musics:/musics:rw
-      - public_data:/public:rw
      - jellyfin_cache:/cache
+      - public_data:/public
+      - private_data:/private
    # Hardware acceleration (For Intel and AMD GPUs)
    devices:
      - /dev/dri:/dev/dri
@@ -32,15 +29,9 @@ services:
 volumes:
  jellyfin_config:
    name: jellyfin_config
-  jellyfin_data_movies:
-    name: jellyfin_data_movies
-  jellyfin_data_series:
-    name: jellyfin_data_series
-  jellyfin_data_documentaries:
-    name: jellyfin_data_documentaries
-  jellyfin_data_musics:
-    name: jellyfin_data_musics
+  jellyfin_cache:
+    name: jellyfin_cache
  public_data:
    name: public_data
-  jellyfin_cache:
-    name: jellyfin_cache
+  private_data:
+    name: private_data
@@ -0,0 +1,27 @@
+services:
+  main_infrastructure:
+    container_name: main_infrastructure
+    image: debian:latest
+    profiles:
+      - main_infrastructure
+    user: "root"
+    group_add:
+      - '${PUID:-1000}'
+    volumes:
+      - public_data:/public
+      - private_data:/private
+    networks:
+      - infra-network
+    # Fix root permissions on mounted volumes
+    command: chown -R ${PUID:-1000}:${PGID:-1000} /public /private
+
+volumes:
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data
+
+networks:
+  infra-network:
+    driver: bridge
+    name: infra-network
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com
@@ -0,0 +1,33 @@
+services:
+  # openssh
+  openssh:
+    image: linuxserver/openssh-server:latest
+    container_name: openssh
+    profiles:
+      - openssh
+    depends_on:
+      - caddy
+    restart: on-failure:5
+    env_file:
+      - ./openssh/env/openssh.env
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+    volumes:
+      - openssh_config:/config
+      - public_data:/public
+      - private_data:/private
+      - ./openssh/config/authorized_keys:/authorized_ssh_keys:ro
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+    ports:
+      - 2222:2222
+volumes:
+  openssh_config:
+    name: openssh_config
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data
@@ -0,0 +1,15 @@
+TZ=Etc/UTC
+SUDO_ACCESS=false
+PASSWORD_ACCESS=false
+DOCKER_MODS=linuxserver/mods:openssh-server-rsync
+#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
+PUBLIC_KEY_DIR=/authorized_ssh_keys
+USER_NAME=bensuperpc
+
+#PUBLIC_KEY=yourpublickey
+#PUBLIC_KEY_FILE=/path/to/file
+#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
+#PUBLIC_KEY_URL=https://github.com/username.keys
+#USER_PASSWORD=password
+#USER_PASSWORD_FILE=/path/to/file
+#LOG_STDOUT=
@@ -25,4 +25,6 @@ volumes:
  qbittorrent_config:
    name: qbittorrent_config
  public_data:
-    name: public_data
+    name: public_data
+  private_data:
+    name: private_data
@@ -16,6 +16,7 @@ services:
    volumes:
      - syncthing_config:/config
      - public_data:/data1
+      - private_data:/data2
    networks:
      - infra-network
    security_opt:
@@ -26,3 +27,5 @@ volumes:
    name: syncthing_config
  public_data:
    name: public_data
+  private_data:
+    name: private_data
@@ -0,0 +1 @@
+TZ=Etc/UTC
@@ -25,7 +25,9 @@ services:
 volumes:
  transmission_config:
    name: transmission_config
+  transmission_watch:
+    name: transmission_watch
  public_data:
    name: public_data
-  transmission_watch:
-    name: transmission_watch
+  private_data:
+    name: private_data
				`@@ -0,0 +1 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com`