diff options
| -rw-r--r-- | docker-compose.yml | 64 | ||||
| -rw-r--r-- | etc/Caddyfile | 10 | ||||
| -rw-r--r-- | etc/pkg.json | 28 |
3 files changed, 86 insertions, 16 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 74b41c5..66985a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - GITEA__server__DISABLE_SSH = false - GITEA__server__SSH_PORT = 22 - GITEA__server__SSH_LISTEN_PORT = 22 - + restart: always networks: - gitea @@ -99,7 +99,7 @@ services: networks: - gitea - goproxy: + pkg: image: gitrepo.ru/neonxp/pkg:latest container_name: goproxy restart: unless-stopped @@ -108,12 +108,72 @@ services: networks: - gateway + opengist: + image: ghcr.io/thomiceli/opengist:1 + container_name: opengist + restart: unless-stopped + volumes: + - "opengist:/root/.opengist" + environment: + CONFIG: | + log-level: info + ssh.git-enabled: false + networks: + - gateway + + remark: + image: umputun/remark42:latest + container_name: "remark42" + hostname: "remark42" + restart: always + + logging: + driver: json-file + options: + max-size: "10m" + max-file: "5" + + environment: + - REMARK_URL=https://comments.neonxp.dev + - SITE=neonxp_dev + - SECRET=8Wwt1o6G5nVBMJot + - DEBUG=false + - AUTH_EMAIL_ENABLE=true + - AUTH_TELEGRAM=true + - AUTH_EMAIL_FROM=i@neonxp.dev + - NOTIFY_EMAIL_FROM=i@neonxp.dev + - AUTH_EMAIL_SUBJ=NeonXP.dev comments + - NOTIFY_USERS=telegram,email + - NOTIFY_ADMINS=telegram,email + - NOTIFY_TELEGRAM_CHAN=760557 + - TELEGRAM_TOKEN=279146841:AAE9Yd2WMkFCadnk2hNtF3By1_gAhbO3usM + - SMTP_HOST=smtp.mail.ru + - SMTP_PORT=465 + - SMTP_USERNAME=i@neonxp.dev + - SMTP_PASSWORD=m317T2KuCgXdxfKh5BjK + - SMTP_LOGIN_AUTH=true + - SMTP_TLS=true + - EMOJI=true + - ALLOWED_HOSTS=neonxp.dev + - AUTH_SAME_SITE=none + - ADMIN_SHARED_ID=email_0298a691a8d2e6e6e539bccdff2e30eca6df0280,telegram_b4201451070ba78a1742cd54d4223eccc0249c1a + # Enable it only for the initial comment import or for manual backups. + # Do not leave the server running with the ADMIN_PASSWD set if you don't have an intention + # to keep creating backups manually! + # - ADMIN_PASSWD=<your secret password> + volumes: + - remark:/srv/var + networks: + - gateway + volumes: woodpecker-server-data: caddy_data: caddy_config: forgejo: postgres: + opengist: + remark: networks: gateway: diff --git a/etc/Caddyfile b/etc/Caddyfile index f85445b..989b51b 100644 --- a/etc/Caddyfile +++ b/etc/Caddyfile @@ -87,4 +87,14 @@ oper2.ru { tls i@neonxp.dev redir * https://remember-botsyk.livejournal.com/ 302 } + +gist.neonxp.dev { + reverse_proxy opengist:6157 +} + +comments.neonxp.dev { + reverse_proxy remark:8080 +} + + # https://caddyserver.com/docs/caddyfile diff --git a/etc/pkg.json b/etc/pkg.json index 62227d3..b4d5e89 100644 --- a/etc/pkg.json +++ b/etc/pkg.json @@ -5,56 +5,56 @@ "pkg": { "pkg": "pkg", "vcs": "git", - "repo": "https://github.com/neonxp/pkg", + "repo": "https://gitrepo.ru/neonxp/pkg", "desc": "Сервер проксирующий собственные гошные пакеты, чтобы не зависеть от конкретного репозитория. Этот сайт." }, "objectid": { "pkg": "objectid", "vcs": "git", - "repo": "https://github.com/neonxp/objectid", + "repo": "https://gitrepo.ru/neonxp/objectid", "desc": "Генерация ObjectID на основе даты. Глобально уникальные." }, "jsonrpc2": { "pkg": "jsonrpc2", "vcs": "git", - "repo": "https://github.com/neonxp/jsonrpc2", + "repo": "https://gitrepo.ru/neonxp/jsonrpc2", "desc": "Имплементация сервера JSON-RPC 2.0 с генериками." }, "collection": { "pkg": "collection", "vcs": "git", - "repo": "https://github.com/neonxp/collection", + "repo": "https://gitrepo.ru/neonxp/collection", "desc": "Коллекция методов для работы с коллекциями" }, - "cluster": { - "pkg": "cluster", - "vcs": "git", - "repo": "https://github.com/neonxp/go-cluster", - "desc": "p2p cluster" - }, "extra": { "pkg": "extra", "vcs": "git", - "repo": "https://github.com/neonxp/extra", + "repo": "https://gitrepo.ru/neonxp/extra", "desc": "Пакет с разными полезными функциями без дополнительных зависимостей." }, "di": { "pkg": "di", "vcs": "git", - "repo": "https://github.com/neonxp/di", + "repo": "https://gitrepo.ru/neonxp/di", "desc": "Простой DI контейнер с генериками" }, "expression": { "pkg": "expression", "vcs": "git", - "repo": "https://github.com/neonxp/expression", + "repo": "https://gitrepo.ru/neonxp/expression", "desc": "Парсер и исполнитель произвольных выражений" }, "json": { "pkg": "json", "vcs": "git", - "repo": "https://github.com/neonxp/json", + "repo": "https://gitrepo.ru/neonxp/json", "desc": "Библиотека маршалинга анмаршалинга json в дерево с возможностью делать запросы над деревом" + }, + "ui": { + "pkg": "ui", + "vcs": "git", + "repo": "https://gitrepo.ru/neonxp/ui", + "desc": "Библиотека построения интерфейсов на wasm" } } }
\ No newline at end of file |