Compare commits

...

73 Commits

Author SHA1 Message Date
sporada 1febed0fec Update 'nextcloud/collabora/loolwsd.xml.tpl' 2021-05-02 14:27:11 +02:00
sporada b725a62c4a Update 'nextcloud/live.env.tpl' 2021-05-02 14:26:05 +02:00
Stephan Porada 5b80f9091c Change lables 2021-05-02 14:24:19 +02:00
Stephan Porada 88fed56f9c Update some things 2021-05-01 10:41:26 +02:00
Stephan Porada 698cef6d3d Add rtmp stuff 2021-04-30 18:35:00 +02:00
Stephan Porada 995262ebb2 Fix typo 2021-04-30 16:17:18 +02:00
Stephan Porada d573b93f10 Fix database connection 2021-04-30 15:48:17 +02:00
Stephan Porada 849a45a24d Merge branch 'master' of https://gitea.sporada.eu/sporada/selfhosted-traefik 2021-04-30 15:06:23 +02:00
Stephan Porada 61307150e5 Add some volumes 2021-04-30 15:05:53 +02:00
sporada 67ec78b44e Update 'osp/docker-compose.yml' 2021-04-30 15:05:17 +02:00
sporada 0d926c760b Update 'osp/live.env.tpl' 2021-04-30 14:26:36 +02:00
sporada 23b5979b43 Update 'osp/live.env.tpl' 2021-04-30 14:21:16 +02:00
sporada 5859a66110 Update 'osp/live.env.tpl' 2021-04-30 14:16:39 +02:00
sporada 54106dc484 Update 'osp/live.env.tpl' 2021-04-30 14:13:19 +02:00
sporada f7545b7ce6 Update 'osp/docker-compose.yml' 2021-04-30 14:08:48 +02:00
sporada ae0c70f1d2 Update 'osp/live.env.tpl' 2021-04-30 14:06:34 +02:00
sporada 34322b44f2 Change ts3 data folder name to data as name 2021-04-30 13:59:13 +02:00
sporada 62f3bc7e25 Update 'osp/live.env.tpl' 2021-04-30 13:56:57 +02:00
sporada 29fbb35699 Update 'osp/live.env.tpl' 2021-04-30 13:55:02 +02:00
sporada d13f9848b9 Add 'osp/live.env.tpl' 2021-04-30 13:48:59 +02:00
sporada b451f1794c Add docker-compose.yml 2021-04-30 13:46:37 +02:00
sporada b7cb95cacb Add folder and Readme for Open Streaming Paltform 2021-04-30 13:31:03 +02:00
sporada af4f411222 Update 'ts3/docker-compose.yml' 2021-04-29 11:42:39 +02:00
sporada 52951c909a Update 'ts3/docker-compose.yml' 2021-04-29 11:40:24 +02:00
sporada 2401458db3 Update 'ts3/docker-compose.yml' 2021-04-29 11:37:49 +02:00
sporada 91451e2fd5 Remove clutter 2021-04-29 11:26:15 +02:00
sporada 3fa7f9e930 Delete 'nextcloud/collabora/loolwsd.xml' 2021-04-29 11:15:23 +02:00
sporada 8ffa30b17d Merge branches 'master' and 'remote_setup' of https://gitea.sporada.eu/sporada/selfhosted-traefik 2021-04-29 11:11:57 +02:00
sporada ca3a126691 Update 'nextcloud/README.md' 2021-04-29 09:55:40 +02:00
sporada 79061ab73e Update 'nextcloud/README.md' 2021-04-29 09:54:16 +02:00
sporada c2c08401cc Update 'nextcloud/README.md' 2021-04-29 09:52:39 +02:00
sporada d39c11cb89 Update 'nextcloud/README.md' 2021-04-29 09:41:13 +02:00
sporada 232cb23bf9 Update 'nextcloud/README.md' 2021-04-28 09:16:15 +02:00
sporada f3f1ef7b87 Update 'README.md' 2021-04-26 10:16:54 +02:00
sporada 42ac20d0a5 Update 'nextcloud/README.md' 2021-04-26 10:14:18 +02:00
sporada ede5d30aab Update 'nextcloud/README.md' 2021-04-26 10:13:10 +02:00
sporada 6ea492244a Update 'README.md' 2021-04-26 10:10:26 +02:00
sporada f8fda83d3e Update 'README.md' 2021-04-22 21:47:34 +02:00
sporada 981993197b Add .gitignore add traefik/README.md 2021-04-22 21:44:36 +02:00
sporada 51e31ed336 Add .gitignore add README.md 2021-04-22 21:42:20 +02:00
sporada bbd2680e24 Add 'traefik/RE' 2021-04-22 21:39:34 +02:00
sporada c9d0988954 Update 'gitea/docker-compose.yml' 2021-04-22 21:38:02 +02:00
sporada 3e2e267b63 Update 'traefik/docker-compose.yml' 2021-04-22 21:03:31 +02:00
sporada e35f58ed06 Update 'ts3/live.env.tpl' 2021-04-22 16:35:29 +02:00
sporada 7ffd6b8638 Update 'ts3/docker-compose.yml' 2021-04-22 16:32:44 +02:00
sporada c1995fb9b6 Update 'traefik/docker-compose.yml' 2021-04-22 16:27:11 +02:00
sporada c3213609a2 Update 'nextcloud/mariadb-conf/docker.cnf' 2021-04-22 10:39:27 +02:00
sporada dc18e19d2d Update 'nextcloud/mariadb-conf/docker.cnf' 2021-04-22 10:32:54 +02:00
sporada a8d5d30860 Update 'nextcloud/mariadb-conf/docker.cnf' 2021-04-22 09:44:19 +02:00
sporada f801da71f0 remove mariadb folder 2021-04-22 09:14:45 +02:00
sporada 81e972fe38 Replace mariadb and files within with mariadb-conf 2021-04-22 09:12:03 +02:00
sporada d36559a730 Fix folder name 2021-04-22 09:09:41 +02:00
sporada 9d77dbd852 Fix mistake from commit before 2021-04-22 09:07:49 +02:00
sporada 6313799d56 update docker-compose to use mariadb docker.cnf for custom settings 2021-04-22 09:06:50 +02:00
sporada a8e15141e7 Add 'nextcloud/mariadb/docker.cnf' 2021-04-22 09:04:01 +02:00
sporada e504002bd2 Update 'nextcloud/README.md' 2021-04-22 08:30:13 +02:00
sporada b3441aa8a9 Update 'nextcloud/README.md' 2021-04-21 11:32:48 +02:00
sporada 742807c77f Update nextcloud image to version 21 ( CRON and App) 2021-04-21 11:12:59 +02:00
sporada d8ff0b67f3 Update nextcloud image to version 21 2021-04-21 11:11:43 +02:00
sporada 4bef286f43 Update 'nextcloud/live.env.tpl' 2021-04-21 10:05:19 +02:00
sporada e6a53c0f90 „nextcloud/README.md“ ändern 2021-04-21 09:34:52 +02:00
sporada 4e90038674 „README.md“ ändern 2021-03-25 14:53:01 +01:00
sporada 36aab6d41a Add WIP setup guide 2021-03-25 14:50:47 +01:00
sporada 4116f9fc1d Dateien hochladen nach „wordpress“ 2021-03-25 14:45:24 +01:00
sporada 66ed1f76d9 Add ts3 service 2021-03-25 14:44:49 +01:00
sporada 3c7b1b29c1 Add traefik 2021-03-25 14:44:16 +01:00
sporada 994324d812 Add nginx-rtmp 2021-03-25 14:43:37 +01:00
sporada e3fbe0d281 „nextcloud/README.md“ ändern 2021-03-25 14:42:45 +01:00
sporada 8a6433406d „nextcloud/README.md“ hinzufügen 2021-03-25 14:42:10 +01:00
sporada 434e66c95e Add collabora config 2021-03-25 14:39:33 +01:00
sporada d66f34936b Dateien hochladen nach „nextcloud“
Add nextcloud service
2021-03-25 14:37:52 +01:00
sporada 6105b70fbf Dateien hochladen nach „gitea“
Add Gite service
2021-03-25 14:37:10 +01:00
sporada 51db14c505 Initial commit 2021-03-25 14:02:37 +01:00
9 changed files with 115 additions and 13 deletions
+1 -1
View File
@@ -142,7 +142,7 @@
<storage desc="Backend storage"> <storage desc="Backend storage">
<filesystem allow="false" /> <filesystem allow="false" />
<wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true"> <wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
<host desc="Regex pattern of hostname to allow or deny." allow="true">nextcloud\\.domain\\.com</host> <host desc="Regex pattern of hostname to allow or deny." allow="true">nextcloud\.domain\.com</host>
<host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host> <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
<host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host> <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
<host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host> <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
-3
View File
@@ -38,7 +38,6 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
nextcloud-app: nextcloud-app:
depends_on: depends_on:
- nextcloud-db - nextcloud-db
@@ -147,5 +146,3 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- ./collabora/loolwsd.xml:/etc/loolwsd/loolwsd.xml - ./collabora/loolwsd.xml:/etc/loolwsd/loolwsd.xml
+2 -2
View File
@@ -15,13 +15,13 @@ NEXTCLOUD_ROOT=/home/compute/services/nextcloud
NEXTCLOUD_DATA_DIR=/srv/nextcloud/data NEXTCLOUD_DATA_DIR=/srv/nextcloud/data
NEXTCLOUD_FQDN=your_nextcloud_sub_domain.domain.com NEXTCLOUD_FQDN=your_nextcloud_sub_domain.domain.com
# This is the IP of the Trafik container. This changes if the traefik container restarts. If it is not the current traefik container IP collabora does not work. Check the current traefik container IP with: docker inspect traefik and get the IP from the Networks -> traefik_default -> IPAddress section # This is the IP of the Trafik container. This changes if the traefik container restarts. If it is not the current traefik container IP collabora does not work. Check the current traefik container IP with: docker inspect traefik and get the IP from the Networks -> traefik_default -> IPAddress section
TRAEFIK_CONTAINER_IP=172.27.0.16 TRAEFIK_CONTAINER_IP=172.27.0.16 # This has to be the current IP of the traefik container check this with docker inspect traefik
PHP_MEMORY_LIMIT=2048M PHP_MEMORY_LIMIT=2048M
PHP_UPLOAD_LIMIT=8G PHP_UPLOAD_LIMIT=8G
# Collabora # Collabora
COLLABORA_FQDN=collabora.domain.com COLLABORA_FQDN=collabora.domain.com
COLLABORA_DOMAIN=nextcloud_sub_domain\\.domain\\.com # This is the domain which the collabora server is requests accepting from. COLLABORA_DOMAIN=nextcloud_sub_domain\.domain\.com # This is the domain which the collabora server is requests accepting from.
COLLABORA_USERNAME=username COLLABORA_USERNAME=username
COLLABORA_PASSWORD=password_collabora COLLABORA_PASSWORD=password_collabora
+5
View File
@@ -0,0 +1,5 @@
https://openstreamingplatform.com/
Open Streaming Platform (OSP) is an open-source, RTMP streamer software front-end for Arut's Nginx-RTMP Module. OSP was designed as a self-hosted alternative to services such as Twitch.tv, Ustream.tv, Mixer, and Youtube Live.
This service is based on an older software version beta6d and not on the current version 0.8.8 because an docker image ist not available for it right now.
+73
View File
@@ -0,0 +1,73 @@
version: '3.5'
networks:
default:
external:
name: traefik_default
services:
osp-app:
depends_on:
- osp-db
- osp-redis
container_name: osp-app
entrypoint: ["/opt/osp/setup/docker/wait-for-it.sh", "osp-db:3306", "--strict", "-t", "60", "--", "/opt/osp/setup/docker/entrypoint.sh"]
env_file: live.env
environment:
- DB_URL=mysql+pymysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:3306/${MYSQL_DATABASE}
image: deamos/openstreamingplatform:latest
labels:
# Watchtower
- "com.centurylinklabs.watchtower.enable=true"
# Routes
- "traefik.enable=true"
- "traefik.http.routers.osp.entrypoints=websecure"
- "traefik.http.routers.osp.rule=Host(`osp.${DOMAIN}`)"
- "traefik.http.routers.osp.tls=true"
- "traefik.http.routers.osp.tls.certresolver=myresolver"
- "traefik.http.services.osp.loadbalancer.server.port=80"
# RTMP specific
- "traefik.tcp.routers.rtmpcast.entrypoints=osp-rtmp"
- "traefik.tcp.routers.rtmpcast.rule=HostSNI(`osp.${DOMAIN}`)"
- "traefik.tcp.routers.rtmpcast.service=rtmpcast"
- "traefik.tcp.routers.rtmpcast.tls=true"
- "traefik.tcp.routers.rtmpcast.tls.certresolver=myresolver"
- "traefik.tcp.routers.rtmpcast.tls.passthrough=true"
- "traefik.tcp.services.rtmpcast.loadbalancer.server.port=1935"
networks:
- default
restart: unless-stopped
volumes:
- ${OSP_ROOT}/data:/var/www
- ${OSP_ROOT}/data/nginx/conf:/usr/local/nginx/conf
osp-db:
image: mariadb:10
container_name: osp-db
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
restart: unless-stopped
env_file: live.env
labels:
# Watchtower
- "com.centurylinklabs.watchtower.enable=true"
networks:
- default
volumes:
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ${OSP_ROOT}/db:/var/lib/mysql
osp-redis:
image: redis:6-alpine
container_name: osp-redis
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}
labels:
- "com.centurylinklabs.watchtower.enable=true"
networks:
- default
restart: unless-stopped
volumes:
- ${OSP_ROOT}/redis:/data
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
+21
View File
@@ -0,0 +1,21 @@
# MariaDB settings
MYSQL_ROOT_PASSWORD=password_db_root
MYSQL_DATABASE=osp
MYSQL_USER=osp
MYSQL_PASSWORD=password_db
MYSQL_HOST=osp-db
# Redis
REDIS_HOST=osp-redis
REDIS_HOST_PASSWORD=password_redis
# osp
OSP_ROOT=/home/compute/services/osp
FLASK_SECRET=very_secret_key_change_me
FLASK_SALT=very_secret_salt_key_change_me
REDIS_PASSWORD=password_redis
OSP_ALLOWREGISTRATION=False
OSP_REQUIREVERIFICATION=False
# Traefik
DOMAIN=domain.com
+5 -1
View File
@@ -115,6 +115,8 @@ services:
# TS3 entrypoints # TS3 entrypoints
- "--entrypoints.ts-udp.address=:9987/udp" - "--entrypoints.ts-udp.address=:9987/udp"
- "--entrypoints.ts-tcp.address=:30033" - "--entrypoints.ts-tcp.address=:30033"
# OSP rtmp entrypoints
- "--entrypoints.osp-rtmp.address=:1935"
# Use this CA server for testing # Use this CA server for testing
# - "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" # - "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
- "--certificatesresolvers.myresolver.acme.email=${EMAIL}" - "--certificatesresolvers.myresolver.acme.email=${EMAIL}"
@@ -150,8 +152,10 @@ services:
#- "8080:8080" #- "8080:8080"
# TS3 ports # TS3 ports
- "9987:9987/udp" - "9987:9987/udp"
- "10011:10011" #- "10011:10011"
- "30033:30033" - "30033:30033"
# OSP rtmp ports
- "1935:1935"
volumes: volumes:
# For certificate # For certificate
- "./volumes/letsencrypt/acme.json:/letsencrypt/acme.json" - "./volumes/letsencrypt/acme.json:/letsencrypt/acme.json"
+1 -1
View File
@@ -1,2 +1,2 @@
This is now routed via traefik. This is now routed via traefik.
Still checking performance if working it is. Still checking performance if there is no package loss.
+2
View File
@@ -26,6 +26,8 @@ services:
- "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp" - "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp"
- "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp" - "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp"
- "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)" - "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)"
- "traefik.tcp.routers.teamspeak-tcp.tls=true"
- "traefik.tcp.routers.teamspeak-tcp.tls.certresolver=myresolver"
- "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033" - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"
# udp # udp
- "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp" - "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp"