diff --git a/conf.d/tcpwiki.conf b/conf.d/tcpwiki.conf deleted file mode 100644 index be52312..0000000 --- a/conf.d/tcpwiki.conf +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen 80; - server_name tcpwiki.psi.ch; - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name tcpwiki.psi.ch; - - ssl_certificate /etc/nginx/certs/tcpwiki.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/tcpwiki.psi.ch.key; - - location /beta-elternnetzwerk { - proxy_pass http://dokuwiki-elternnetzwerk:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /betrieb-cosyma { - proxy_pass http://dokuwiki-cosyma:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /feldmessung-biogas { - proxy_pass http://dokuwiki-feldmessung:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /gaw { - proxy_pass http://dokuwiki-gaw:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /innosuisse { - proxy_pass http://dokuwiki-innosuisse:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /spin-day-workshops { - proxy_pass http://dokuwiki-spinday:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /tcp { - proxy_pass http://dokuwiki-tcp:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /vfa { - proxy_pass http://dokuwiki-vfa:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /wie-teamarbeit-funktioniert { - proxy_pass http://dokuwiki-teamarbeit:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location /xtl-studie { - proxy_pass http://dokuwiki-xtl:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } -} diff --git a/docker-compose.yaml b/docker-compose.yaml index da452c2..3569090 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -49,116 +49,6 @@ services: networks: - backend - dokuwiki-elternnetzwerk: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-elternnetzwerk - restart: always - volumes: - - /opt/webcontent/tcpwiki/beta-elternnetzwerk:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-cosyma: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-cosyma - restart: always - volumes: - - /opt/webcontent/tcpwiki/betrieb-cosyma:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-feldmessung: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-feldmessung - restart: always - volumes: - - /opt/webcontent/tcpwiki/feldmessung-biogas:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-gaw: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-gaw - restart: always - volumes: - - /opt/webcontent/tcpwiki/gaw:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-innosuisse: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-innosuisse - restart: always - volumes: - - /opt/webcontent/tcpwiki/innosuisse:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-spinday: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-spinday - restart: always - volumes: - - /opt/webcontent/tcpwiki/spin-day-workshops:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-tcp: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-tcp - restart: always - volumes: - - /opt/webcontent/tcpwiki/tcp:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-vfa: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-vfa - restart: always - volumes: - - /opt/webcontent/tcpwiki/vfa:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-teamarbeit: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-teamarbeit - restart: always - volumes: - - /opt/webcontent/tcpwiki/wie-teamarbeit-funktioniert:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - - dokuwiki-xtl: - image: dokuwiki/dokuwiki:stable - container_name: dokuwiki-xtl - restart: always - volumes: - - /opt/webcontent/tcpwiki/xtl-studie:/storage - environment: - PHP_TIMEZONE: Europe/Zurich - networks: - - backend - networks: public: backend: