Add synapse and tt-rss; Fix gitea, grafana and webdis
This commit is contained in:
parent
bf0f991b49
commit
5373863a3e
12 changed files with 201 additions and 5 deletions
23
gitea/.env
23
gitea/.env
|
|
@ -4,12 +4,16 @@ GITEA__database__NAME="gitea"
|
||||||
GITEA__database__USER="gitea"
|
GITEA__database__USER="gitea"
|
||||||
GITEA__database__PASSWD=""
|
GITEA__database__PASSWD=""
|
||||||
GITEA__database__SSL_MODE="verify-full"
|
GITEA__database__SSL_MODE="verify-full"
|
||||||
|
|
||||||
GITEA__repository__ENABLE_PUSH_CREATE_USER="true"
|
GITEA__repository__ENABLE_PUSH_CREATE_USER="true"
|
||||||
GITEA__repository__ENABLE_PUSH_CREATE_ORG="true"
|
GITEA__repository__ENABLE_PUSH_CREATE_ORG="true"
|
||||||
GITEA__repository__DEFAULT_BRANCH="main"
|
GITEA__repository__DEFAULT_BRANCH="main"
|
||||||
|
|
||||||
GITEA__cors__ENABLED="true"
|
GITEA__cors__ENABLED="true"
|
||||||
GITEA__cors__SCHEME="https"
|
GITEA__cors__SCHEME="https"
|
||||||
|
|
||||||
GITEA__ui__DEFAULT_THEME="arc-green"
|
GITEA__ui__DEFAULT_THEME="arc-green"
|
||||||
|
|
||||||
GITEA__server__DOMAIN="git.serguzim.me"
|
GITEA__server__DOMAIN="git.serguzim.me"
|
||||||
GITEA__server__SSH_DOMAIN="git.serguzim.me"
|
GITEA__server__SSH_DOMAIN="git.serguzim.me"
|
||||||
GITEA__server__SSH_PORT="22"
|
GITEA__server__SSH_PORT="22"
|
||||||
|
|
@ -17,22 +21,41 @@ GITEA__server__ROOT_URL="https://git.serguzim.me/"
|
||||||
GITEA__server__OFFLINE_MODE="true"
|
GITEA__server__OFFLINE_MODE="true"
|
||||||
GITEA__server__LFS_JWT_SECRET=""
|
GITEA__server__LFS_JWT_SECRET=""
|
||||||
GITEA__server__LFS_START_SERVER="true"
|
GITEA__server__LFS_START_SERVER="true"
|
||||||
|
|
||||||
GITEA__security__INSTALL_LOCK="true"
|
GITEA__security__INSTALL_LOCK="true"
|
||||||
GITEA__security__INTERNAL_TOKEN=""
|
GITEA__security__INTERNAL_TOKEN=""
|
||||||
GITEA__security__SECRET_KEY=""
|
GITEA__security__SECRET_KEY=""
|
||||||
|
|
||||||
GITEA__openid__ENABLE_OPENID_SIGNUP="true"
|
GITEA__openid__ENABLE_OPENID_SIGNUP="true"
|
||||||
GITEA__openid__ENABLE_OPENID_SIGNIN="false"
|
GITEA__openid__ENABLE_OPENID_SIGNIN="false"
|
||||||
|
|
||||||
GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION="true"
|
GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION="true"
|
||||||
GITEA__service__ENABLE_BASIC_AUTHENTICATION="false"
|
GITEA__service__ENABLE_BASIC_AUTHENTICATION="false"
|
||||||
GITEA__service__NO_REPLY_ADDRESS="discard.msrg.cc"
|
GITEA__service__NO_REPLY_ADDRESS="discard.msrg.cc"
|
||||||
|
|
||||||
GITEA__webhook__DELIVER_TIMEOUT="60"
|
GITEA__webhook__DELIVER_TIMEOUT="60"
|
||||||
|
|
||||||
GITEA__mailer__ENABLED="true"
|
GITEA__mailer__ENABLED="true"
|
||||||
GITEA__mailer__HOST="mail.serguzim.me:587"
|
GITEA__mailer__HOST="mail.serguzim.me:587"
|
||||||
GITEA__mailer__FROM="Gitea <git@serguzim.me>"
|
GITEA__mailer__FROM="Gitea <git@serguzim.me>"
|
||||||
GITEA__mailer__USER="git@serguzim.me"
|
GITEA__mailer__USER="git@serguzim.me"
|
||||||
GITEA__mailer__PASSWD=""
|
GITEA__mailer__PASSWD=""
|
||||||
GITEA__mailer__SEND_AS_PLAIN_TEXT="true"
|
GITEA__mailer__SEND_AS_PLAIN_TEXT="true"
|
||||||
|
|
||||||
GITEA__picture__DISABLE_GRAVATAR="true"
|
GITEA__picture__DISABLE_GRAVATAR="true"
|
||||||
|
|
||||||
GITEA__oauth2__JWT_SECRET=""
|
GITEA__oauth2__JWT_SECRET=""
|
||||||
|
|
||||||
GITEA__metrics__ENABLED="true"
|
GITEA__metrics__ENABLED="true"
|
||||||
GITEA__metrics__TOKEN=""
|
GITEA__metrics__TOKEN=""
|
||||||
|
|
||||||
|
GITEA__storage__STORAGE_TYPE="minio"
|
||||||
|
GITEA__storage__MINIO_ENDPOINT="sos-de-fra-1.exo.io"
|
||||||
|
GITEA__storage__MINIO_ACCESS_KEY_ID=""
|
||||||
|
GITEA__storage__MINIO_SECRET_ACCESS_KEY=""
|
||||||
|
GITEA__storage__MINIO_BUCKET="git.serguzim.me"
|
||||||
|
GITEA__storage__MINIO_LOCATION="de-fra-1"
|
||||||
|
GITEA__storage__MINIO_USE_SSL="true"
|
||||||
|
|
||||||
|
GITEA__OTHER__SHOW_FOOTER_BRANDING="true"
|
||||||
|
GITEA__OTHER__SHOW_FOOTER_TEMPLATE_LOAD_TIME="false"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ version: "3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: gitea/gitea:1.16
|
image: gitea/gitea:1.17
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
|
|
||||||
39
monitoring/.env
Normal file
39
monitoring/.env
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
GF_DEFAULT_INSTANCE_NAME="graph.serguzim.me"
|
||||||
|
GF_SERVER_PROTOCOL="http"
|
||||||
|
GF_SERVER_DOMAIN="graph.serguzim.me"
|
||||||
|
GF_SERVER_ROOT_URL="https://graph.serguzim.me/"
|
||||||
|
GF_DATABASE_TYPE="postgres"
|
||||||
|
GF_DATABASE_HOST="db.serguzim.me"
|
||||||
|
GF_DATABASE_NAME="grafanadb"
|
||||||
|
GF_DATABASE_USER="grafana"
|
||||||
|
GF_DATABASE_PASSWORD=""
|
||||||
|
GF_DATABASE_SSL_MODE="verify-full"
|
||||||
|
GF_SECURITY_ADMIN_USER=""
|
||||||
|
GF_SECURITY_SECRET_KEY=""
|
||||||
|
GF_SECURITY_COOKIE_SECURE="true"
|
||||||
|
GF_SECURITY_COOKIE_SAMESITE="strict"
|
||||||
|
GF_SECURITY_ALLOW_EMBEDDING="true"
|
||||||
|
GF_USERS_ALLOW_SIGN_UP="false"
|
||||||
|
GF_AUTH_DISABLE_LOGIN_FORM="true"
|
||||||
|
GF_SIGNOUT_REDIRECT_URL="https://graph.serguzim.me"
|
||||||
|
GF_OAUTH_AUTO_LOGIN="true"
|
||||||
|
GF_AUTH_ANONYMOUS_ENABLED="true"
|
||||||
|
GF_AUTH_ANONYMOUS_ORG_NAME="Main Org."
|
||||||
|
GF_AUTH_ANONYMOUS_ORG_ROLE="Viewer"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_ENABLED="true"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_NAME="auth.serguzim.me"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_ALLOW_SIGN_UP="true"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_CLIENT_ID=""
|
||||||
|
GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET=""
|
||||||
|
GF_AUTH_GENERIC_OAUTH_SCOPES="openid profile email"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_AUTH_URL="https://auth.serguzim.me/application/o/authorize/"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_TOKEN_URL="https://auth.serguzim.me/application/o/token/"
|
||||||
|
GF_AUTH_GENERIC_OAUTH_API_URL="https://auth.serguzim.me/application/o/userinfo/"
|
||||||
|
GF_AUTH_SIGNOUT_REDIRECT_URL="https://auth.serguzim.me/if/session-end/graph_serguzim_me/"
|
||||||
|
GF_AUTH_OAUTH_AUTO_LOGIN="true"
|
||||||
|
GF_SMTP_ENABLED="true"
|
||||||
|
GF_SMTP_HOST="mail.serguzim.me:587"
|
||||||
|
GF_SMTP_USER="graph@serguzim.me"
|
||||||
|
GF_SMTP_PASSWORD=""
|
||||||
|
GF_SMTP_FROM_ADDRESS="graph@serguzim.me"
|
||||||
|
GF_SMTP_FROM_NAME="Grafana"
|
||||||
16
monitoring/docker-compose.yml
Normal file
16
monitoring/docker-compose.yml
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
grafana:
|
||||||
|
image: grafana/grafana
|
||||||
|
restart: always
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
- .secret.env
|
||||||
|
volumes:
|
||||||
|
- grafana-data:/var/lib/grafana/
|
||||||
|
user: "104"
|
||||||
|
ports:
|
||||||
|
- 3001:3000/tcp
|
||||||
|
volumes:
|
||||||
|
grafana-data:
|
||||||
2
synapse/data/.gitignore
vendored
Normal file
2
synapse/data/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
/secrets.yaml
|
||||||
|
msrg.cc.signing.key
|
||||||
74
synapse/data/homeserver.yaml
Normal file
74
synapse/data/homeserver.yaml
Normal file
|
|
@ -0,0 +1,74 @@
|
||||||
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/index.html
|
||||||
|
|
||||||
|
server_name: "msrg.cc"
|
||||||
|
pid_file: /data/homeserver.pid
|
||||||
|
public_baseurl: https://matrix.msrg.cc/
|
||||||
|
allow_public_rooms_without_auth: true
|
||||||
|
allow_public_rooms_over_federation: true
|
||||||
|
|
||||||
|
listeners:
|
||||||
|
- port: 8008
|
||||||
|
tls: false
|
||||||
|
type: http
|
||||||
|
x_forwarded: true
|
||||||
|
resources:
|
||||||
|
- names:
|
||||||
|
- client
|
||||||
|
- federation
|
||||||
|
- metrics
|
||||||
|
compress: false
|
||||||
|
|
||||||
|
admin_contact: "mailto:tobias@msrg.cc"
|
||||||
|
|
||||||
|
acme:
|
||||||
|
enabled: false
|
||||||
|
|
||||||
|
database:
|
||||||
|
name: "psycopg2"
|
||||||
|
args:
|
||||||
|
user: "synapse"
|
||||||
|
#password: ""
|
||||||
|
database: "synapse"
|
||||||
|
host: "node002.serguzim.me"
|
||||||
|
cp_min: 5
|
||||||
|
cp_max: 10
|
||||||
|
|
||||||
|
log_config: "/data/msrg.cc.log.config"
|
||||||
|
media_store_path: "/media_store"
|
||||||
|
max_upload_size: 500M
|
||||||
|
enable_registration: false
|
||||||
|
enable_metrics: true
|
||||||
|
report_stats: true
|
||||||
|
|
||||||
|
#macaroon_secret_key: ""
|
||||||
|
#form_secret: ""
|
||||||
|
signing_key_path: "/data/msrg.cc.signing.key"
|
||||||
|
|
||||||
|
trusted_key_servers:
|
||||||
|
- server_name: "matrix.org"
|
||||||
|
suppress_key_server_warning: true
|
||||||
|
|
||||||
|
oidc_providers:
|
||||||
|
- idp_id: "auth_serguzim_me"
|
||||||
|
idp_name: "auth.serguzim.me"
|
||||||
|
issuer: "https://auth.serguzim.me/application/o/matrix_serguzim_me/"
|
||||||
|
#client_id: ""
|
||||||
|
#client_secret: ""
|
||||||
|
scopes:
|
||||||
|
- "openid"
|
||||||
|
- "profile"
|
||||||
|
- "email"
|
||||||
|
user_mapping_provider:
|
||||||
|
config:
|
||||||
|
localpart_template: "{{ user.preferred_username }}"
|
||||||
|
display_name_template: "{{ user.name }}"
|
||||||
|
|
||||||
|
email:
|
||||||
|
smtp_host: mail.serguzim.me
|
||||||
|
smtp_port: 587
|
||||||
|
smtp_user: "matrix@serguzim.me"
|
||||||
|
#smtp_pass: ""
|
||||||
|
require_transport_security: true
|
||||||
|
notif_from: "Matrix <matrix@serguzim.me>"
|
||||||
|
|
||||||
|
# vim:ft=yaml
|
||||||
22
synapse/data/msrg.cc.log.config
Normal file
22
synapse/data/msrg.cc.log.config
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
version: 1
|
||||||
|
|
||||||
|
formatters:
|
||||||
|
precise:
|
||||||
|
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
|
||||||
|
|
||||||
|
handlers:
|
||||||
|
console:
|
||||||
|
class: logging.StreamHandler
|
||||||
|
formatter: precise
|
||||||
|
|
||||||
|
loggers:
|
||||||
|
synapse.storage.SQL:
|
||||||
|
# beware: increasing this to DEBUG will make synapse log sensitive
|
||||||
|
# information such as access tokens.
|
||||||
|
level: INFO
|
||||||
|
|
||||||
|
root:
|
||||||
|
level: INFO
|
||||||
|
handlers: [console]
|
||||||
|
|
||||||
|
disable_existing_loggers: false
|
||||||
24
synapse/docker-compose.yml
Normal file
24
synapse/docker-compose.yml
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
|
||||||
|
synapse:
|
||||||
|
image: docker.io/matrixdotorg/synapse:latest
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
- SYNAPSE_CONFIG_PATH=/data/
|
||||||
|
volumes:
|
||||||
|
- ./data:/data
|
||||||
|
- media_store:/media_store
|
||||||
|
ports:
|
||||||
|
- 8008:8008/tcp
|
||||||
|
|
||||||
|
synapse-admin:
|
||||||
|
image: awesometechnologies/synapse-admin:latest
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- "8009:80"
|
||||||
|
restart: always
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
media_store:
|
||||||
17
tt-rss/.env
Normal file
17
tt-rss/.env
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
TTRSS_DB_USER=tinytinyrss
|
||||||
|
TTRSS_DB_NAME=tinytinyrss
|
||||||
|
TTRSS_DB_PASS=
|
||||||
|
TTRSS_DB_TYPE=pgsql
|
||||||
|
TTRSS_DB_HOST=db.serguzim.me
|
||||||
|
|
||||||
|
TTRSS_SELF_URL_PATH=https://rss.serguzim.me/tt-rss/
|
||||||
|
|
||||||
|
# You can customize other config.php defines by setting overrides here.
|
||||||
|
# See app/Dockerfile for complete list. Examples:
|
||||||
|
# TTRSS_PLUGINS=auth_remote
|
||||||
|
# TTRSS_SINGLE_USER_MODE=true
|
||||||
|
# TTRSS_SESSION_COOKIE_LIFETIME=2592000
|
||||||
|
# TTRSS_FORCE_ARTICLE_PURGE=30
|
||||||
|
# etc, etc.
|
||||||
|
|
||||||
|
HTTP_PORT=8280
|
||||||
35
tt-rss/docker-compose.yml
Normal file
35
tt-rss/docker-compose.yml
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
image: cthulhoo/ttrss-fpm-pgsql-static
|
||||||
|
restart: always
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
- .secret.env
|
||||||
|
volumes:
|
||||||
|
- app:/var/www/html
|
||||||
|
|
||||||
|
updater:
|
||||||
|
image: cthulhoo/ttrss-fpm-pgsql-static
|
||||||
|
restart: always
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
volumes:
|
||||||
|
- app:/var/www/html
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
command: /opt/tt-rss/updater.sh
|
||||||
|
|
||||||
|
web-nginx:
|
||||||
|
image: cthulhoo/ttrss-web-nginx
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- ${HTTP_PORT}:80
|
||||||
|
volumes:
|
||||||
|
- app:/var/www/html:ro
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
app:
|
||||||
|
|
@ -4,7 +4,7 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
command: /usr/local/bin/webdis /config/webdis.json
|
command: /usr/local/bin/webdis /config/webdis.json
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/config
|
- ./webdis.json:/config/webdis.json
|
||||||
networks:
|
networks:
|
||||||
- shared
|
- shared
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
||||||
31
webdis/webdis.json
Normal file
31
webdis/webdis.json
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
{
|
||||||
|
"redis_host": "redis",
|
||||||
|
|
||||||
|
"redis_port": 6379,
|
||||||
|
"redis_auth": null,
|
||||||
|
|
||||||
|
"http_host": "0.0.0.0",
|
||||||
|
"http_port": 7379,
|
||||||
|
|
||||||
|
"threads": 5,
|
||||||
|
"pool_size": 20,
|
||||||
|
|
||||||
|
"daemonize": false,
|
||||||
|
"websockets": false,
|
||||||
|
|
||||||
|
"database": 0,
|
||||||
|
|
||||||
|
"acl": [
|
||||||
|
{
|
||||||
|
"disabled": ["DEBUG"]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"http_basic_auth": "user:password",
|
||||||
|
"enabled": ["DEBUG"]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
|
||||||
|
"verbosity": 4,
|
||||||
|
"logfile": "/dev/stderr"
|
||||||
|
}
|
||||||
Reference in a new issue