Merge branch 'dev' into main

apps/listmonk/.env

@@ -1,48 +1,35 @@
-W9_REPO=wordpress
-W9_DIST=community
-W9_VERSION=latest
+W9_REPO=listmonk/listmonk
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='VZX7AFV1G0M!fHHe'
 
-W9_POWER_PASSWORD=1PrMxExC45LsCT
+W9_HTTP_PORT=9000
+W9_HTTP_PORT_SET='9001'
+W9_ID='listmonk'
 
-# Environments which for user settings when create application
-# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
-W9_HTTP_PORT_SET=9001
-# W9_HTTPS_PORT_SET=9002
-# W9_DB_PORT_SET=3306
-# W9_SSH_PORT_SET=23
-W9_KEY_SET="dfsjdkjf77xjxcjcj"
-
-#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_ID=listmonk
-
-# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
-# Some container (e.g teleport) need HTTPS access, then need to set this pra
-W9_HTTP_PORT=80
-W9_HTTPS_PORT=81
 
 W9_LOGIN_USER=admin
-# use https://1password.com/zh-cn/password-generator/  to genarate 14 bit password
-# this password can also use password file
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
-W9_ADMIN_PATH="/wp-login"
-
-# Container name's suffix must use one of the value
-W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
-
-# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT, http(s)://IP:PORT
-W9_URL=internet_ip:$W9_HTTP_PORT
-# modifies W9_URL on init when it is true
-W9_URL_REPLACE=true
-
-W9_URL_WITH_PORT=false
-
+W9_DB_EXPOSE="postgresql"
+W9_URL='internet_ip:$W9_HTTP_PORT'
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
 
-# Below environment is created by apphub
-
-#W9_NAME=""
-#W9_RCODE=""
+# Below environment is created by listmonk: https://listmonk.app/docs/configuration/
+
+LISTMONK_app__address=0.0.0.0:9000
+LISTMONK_db__user=postgres
+LISTMONK_db__password=$W9_POWER_PASSWORD
+LISTMONK_db__database=listmonk
+LISTMONK_db__host=$W9_ID-postgresql
+LISTMONK_db__port=5432
+LISTMONK_db__ssl_mode=disable
+LISTMONK_db__max_open=25
+LISTMONK_db__max_idle=25
+LISTMONK_db__max_lifetime=300s
+TZ="Etc/UTC"
+# If these (optional) are set during the first `docker compose up`, then the Super Admin user is automatically created.
+LISTMONK_ADMIN_USER=$W9_LOGIN_USER
+LISTMONK_ADMIN_PASSWORD=$W9_LOGIN_PASSWORD

apps/listmonk/Notes.md

@@ -1,2 +1,7 @@
-# Appname
+# listmonk
+
+- LISTMONK_app__address: 0.0.0.0:9000 is very important
+- Multiply languages: **Settings > General**
+
+
 ## FAQ

apps/listmonk/docker-compose.yml

@@ -1,48 +1,41 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# image,docs: https://github.com/knadh/listmonk/blob/master/docker-compose.yml
 
 services:
 
-  wordpress:
+  app:
     image: $W9_REPO:$W9_VERSION
     container_name: $W9_ID
+    hostname: listmonk.example.com 
     restart: unless-stopped
-    #This is for access host from container
-    # extra_hosts: ["host.docker.internal:host-gateway"]
-    # command: |
-    #   /bin/bash -c "ping -c 3 host.docker.internal"
-    logging:
-      driver: "json-file"
-      options:
-          max-file: "5"
-          max-size: 10m
-    deploy:
-      resources:
-        limits:
-          memory: 5g
-          cpus: '0.7'
     ports:
-      - $W9_HTTP_PORT_SET:80
-    env_file: .env
+      - $W9_HTTP_PORT_SET:9000
+    env_file: 
+      - .env
+    depends_on:
+      - db
+    command: [sh, -c, "./listmonk --install --idempotent --yes --config '' && ./listmonk --upgrade --yes --config '' && ./listmonk --config ''"]
     volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+      - listmonk:/listmonk/uploads:rw
 
-  mariadb:
-    image: mariadb:10.4
-    container_name: $W9_ID-mariadb
+  db:
+    image: postgres:17-alpine
+    container_name: $W9_ID-postgresql
     restart: unless-stopped
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U listmonk"]
+      interval: 10s
+      timeout: 5s
+      retries: 6
     volumes:
-      - mysql_data:/var/lib/mysql
+      - postgres_data:/var/lib/postgresql/data
     environment:
-      MYSQL_DATABASE: $W9_ID
-      MYSQL_USER: $W9_ID
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      POSTGRES_USER: $LISTMONK_db__user
+      POSTGRES_PASSWORD: $LISTMONK_db__password
+      POSTGRES_DB: $LISTMONK_db__database
 
 volumes:
-  wordpress:
-  mysql_data:
+  listmonk:
+  postgres_data:
 
 networks:
   default:

apps/ttrss/.env

@@ -1,48 +1,34 @@
-W9_REPO=wordpress
-W9_DIST=community
-W9_VERSION=latest
+W9_REPO=cthulhoo/ttrss-fpm-pgsql-static
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='y9Ur5h4xQp62H#F7'
+W9_HTTP_PORT_SET='9001'
 
-W9_POWER_PASSWORD=1PrMxExC45LsCT
-
-# Environments which for user settings when create application
-# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
-W9_HTTP_PORT_SET=9001
-# W9_HTTPS_PORT_SET=9002
-# W9_DB_PORT_SET=3306
-# W9_SSH_PORT_SET=23
-W9_KEY_SET="dfsjdkjf77xjxcjcj"
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_ID=ttrss
-
-# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
-# Some container (e.g teleport) need HTTPS access, then need to set this pra
+W9_ID='ttrss'
 W9_HTTP_PORT=80
-W9_HTTPS_PORT=81
-
 W9_LOGIN_USER=admin
-# use https://1password.com/zh-cn/password-generator/  to genarate 14 bit password
-# this password can also use password file
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
-W9_ADMIN_PATH="/wp-login"
 
-# Container name's suffix must use one of the value
-W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
-
-# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT, http(s)://IP:PORT
-W9_URL=internet_ip:$W9_HTTP_PORT
-# modifies W9_URL on init when it is true
+W9_DB_EXPOSE="postgresql"
+W9_URL='internet_ip:$W9_HTTP_PORT'
 W9_URL_REPLACE=true
-
 W9_URL_WITH_PORT=false
 
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
 
-# Below environment is created by apphub
 
-#W9_NAME=""
-#W9_RCODE=""
+# Below environment is created by apphub: https://tt-rss.org/wiki/InstallationNotes/
+# More settings: https://tt-rss.org/wiki/GlobalConfig/
+
+ADMIN_USER_ACCESS_LEVEL=10
+ADMIN_USER_NAME=$W9_LOGIN_USER
+ADMIN_USER_PASS=$W9_POWER_PASSWORD
+TTRSS_DB_HOST=$W9_ID-postgresql
+TTRSS_DB_USER=postgres
+TTRSS_DB_NAME=ttrss
+TTRSS_DB_PASS=$W9_POWER_PASSWORD

apps/ttrss/CHANGELOG.md

@@ -3,3 +3,5 @@
 ## Release
 ### Fixes and Enhancements
 
+2024-12-30 first release
+

apps/ttrss/Notes.md

@@ -1,2 +1,9 @@
 # Appname
-## FAQ
+
+TTRSS_DB_HOST is `db`, so it need to set
+
+- Multiply languages: Automatically adapt to the browser settings
+- Multiply Users: **偏好设置 > 用户**
+- Add RSS: **Settings > 订阅供稿**，输入订阅范例 `https://www.docker.com/feed`
+
+## FAQ