diff --git a/README.md b/README.md index 2061891..09ced06 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ This is a repository dedicated to Codingteam infrastructure maintenance. We're hosting a set of services: -- XMPP server [![xmpp.net score][badge-xmpp.net]][xmpp.net] - [codingteam.org.ru][] site - [loglist.xyz][] site - [DATA EXPUNGED] @@ -21,11 +20,7 @@ issue][issues]. Host specification ------------------ - -- [codingteam.org.ru][hosts/ctor] -- [cthulhu-3][hosts/cthulhu-3] -- [omnissiah][hosts/omnissiah] -- [xmpp2][hosts.xmpp2] +- [xmpp2][host.xmpp2] Documentation ------------- @@ -37,16 +32,10 @@ The project is distributed under the terms of [the MIT license][docs.license]. The license indication in the project's sources is compliant with the [REUSE specification v3.3][reuse.spec]. -[badge-xmpp.net]: https://xmpp.net/badge.php?domain=codingteam.org.ru [codingteam.org.ru]: https://codingteam.org.ru -[devops]: https://ru.wikipedia.org/wiki/DevOps [docs.contributing]: CONTRIBUTING.md [docs.license]: LICENSES/MIT.txt [host.xmpp2]: xmpp2/README.md -[hosts/cthulhu-3]: cthulhu-3/Host.md -[hosts/ctor]: ctor/Host.md -[hosts/omnissiah]: omnissiah/Host.md [issues]: https://github.com/codingteam/devops/issues [loglist.xyz]: https://loglist.xyz [reuse.spec]: https://reuse.software/spec-3.3/ -[xmpp.net]: https://xmpp.net/result.php?domain=codingteam.org.ru&type=client diff --git a/cthulhu-3/Host.md b/cthulhu-3/Host.md deleted file mode 100644 index e314c8f..0000000 --- a/cthulhu-3/Host.md +++ /dev/null @@ -1,16 +0,0 @@ - - -cthulhu-3 -========= - -This is a service hosted at [DATA EXPUNGED]. - -Enabled end-user services: - -- [horta-hell][] - -[horta-hell]: horta-hell/Readme.md diff --git a/cthulhu-3/horta-hell/Readme.md b/cthulhu-3/horta-hell/Readme.md deleted file mode 100644 index 22ef365..0000000 --- a/cthulhu-3/horta-hell/Readme.md +++ /dev/null @@ -1,22 +0,0 @@ - - -[horta-hell][] -============== - -First, set up a local directory (it will be -`C:/Users/USERNAME/Docker-Data/horta-hell` in this example) that will store the -horta-hell database and its' configuration file. Copy `horta-properties.example` -to that directory and edit the file accordingly. - -How to deploy: - -```console -$ $env:horta_hell_data = 'C:/Users/USERNAME/Docker-Data/horta-hell' # Data container location -$ docker-compose up -d -``` - -[horta-hell]: https://github.com/codingteam/horta-hell diff --git a/cthulhu-3/horta-hell/docker-compose.yml b/cthulhu-3/horta-hell/docker-compose.yml deleted file mode 100644 index 5bdb9fa..0000000 --- a/cthulhu-3/horta-hell/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -version: '2' -services: - application: - image: revenrof/horta-hell:0.17.4 - restart: always - volumes: - - ${horta_hell_data}:/data diff --git a/cthulhu-3/horta-hell/horta.properties.example b/cthulhu-3/horta-hell/horta.properties.example deleted file mode 100644 index 81b3848..0000000 --- a/cthulhu-3/horta-hell/horta.properties.example +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -login=horta-hell -password=password -server=codingteam.org.ru -nickname=horta hell - -xmpp.timeout_ms=10000 - -rooms=sample -sample.room=codingteam@conference.jabber.ru -sample.locale=ru -sample.events=twitter - -localization.default=en - -storage.url=jdbc:h2:/data/hell -storage.user=sa -storage.password= - -twitter.enabled=false -twitter.auth.consumerKey=testkey -twitter.auth.consumerSecret=testsecret -twitter.auth.token=testtoken -twitter.auth.tokenSecret=testtokensecret - -pet.rooms=sample diff --git a/ctor/Host.md b/ctor/Host.md deleted file mode 100644 index 98bb046..0000000 --- a/ctor/Host.md +++ /dev/null @@ -1,30 +0,0 @@ - - -codingteam.org.ru ------------------ - -This is a service hosted on Digital Ocean. - -Enabled end-user services: - -- [codingteam.org.ru][] -- [loglist][] -- [svg-cgs][] - -Make sure to set up `/etc/loglist/loglist.conf` (see -[`loglist.sample.conf`][loglist-sample-conf]). - -Enabled infrastructural services: - -- nginx -- PostgreSQL - -[loglist-sample-conf]: etc/loglist/loglist.sample.conf - -[codingteam.org.ru]: https://github.com/codingteam/codingteam.org.ru -[loglist]: https://github.com/codingteam/loglist -[svg-cgs]: https://github.com/codingteam/svg-cgs diff --git a/ctor/etc/loglist/loglist.sample.conf b/ctor/etc/loglist/loglist.sample.conf deleted file mode 100644 index 6fa5247..0000000 --- a/ctor/etc/loglist/loglist.sample.conf +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -APPLY_EVOLUTIONS_SILENTLY=true -APPROVAL_EMAIL=loglist@example.com -APPROVAL_EMAIL_PASSWORD=example-mail-password -APPROVAL_SMTP_HOST=smtp.example.com -BASIC_AUTH_PASSWORD=basic-password -BASIC_AUTH_USERNAME=example-user -DATABASE_URL=jdbc:postgresql:loglist?user=username&password=postgresql-password -JAVA_OPTS=-Xmx200m -Xss512k -XX:+UseCompressedOops -RECAPTCHA_PRIVATE_KEY=recaptcha-private-key -RECAPTCHA_PUBLIC_KEY=recaptcha-public-key diff --git a/ctor/etc/nginx/nginx.conf b/ctor/etc/nginx/nginx.conf deleted file mode 100644 index 9fc63a7..0000000 --- a/ctor/etc/nginx/nginx.conf +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -user www-data; -worker_processes 4; -pid /run/nginx.pid; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - - ## - # Basic Settings - ## - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 60; - types_hash_max_size 2048; - # server_tokens off; - - server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - ## - # Logging Settings - ## - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - - ## - # Gzip Settings - ## - - gzip on; - gzip_disable "msie6"; - - ## - # Virtual Host Configs - ## - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} diff --git a/ctor/etc/nginx/sites-available/cad b/ctor/etc/nginx/sites-available/cad deleted file mode 100644 index e154d5c..0000000 --- a/ctor/etc/nginx/sites-available/cad +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -server { - listen 80; - listen [::]:80; - server_name cad.codingteam.org.ru; - - root /opt/svg-cgs; - index index.html index.htm; -} diff --git a/ctor/etc/nginx/sites-available/default b/ctor/etc/nginx/sites-available/default deleted file mode 100644 index 17a28d4..0000000 --- a/ctor/etc/nginx/sites-available/default +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 codingteam/devops contributors -# -# SPDX-License-Identifier: MIT - -server { - listen 443 ssl http2; - server_name codingteam.org.ru; - include /etc/nginx/ssl.conf; - - location /_logs/ { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_http_version 1.1; - proxy_pass https://chatlogs.jabber.ru/; - } - - location /old-logs/ { - alias /opt/codingteam/old-logs/; - index index.html; - } - - location / { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host codingteam.org.ru; - proxy_http_version 1.1; - proxy_pass http://localhost:5000/; - } -} - -server { - listen 80; - server_name codingteam.org.ru; - - location / { - rewrite ^(.*)$ https://codingteam.org.ru$1 permanent; - } -} diff --git a/ctor/etc/nginx/sites-available/loglist b/ctor/etc/nginx/sites-available/loglist deleted file mode 100644 index 5440a9d..0000000 --- a/ctor/etc/nginx/sites-available/loglist +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 codingteam/devops contributors -# -# SPDX-License-Identifier: MIT - -server { - listen 443 ssl http2; - server_name loglist.xyz; - include /etc/nginx/ssl.conf; - - location / { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host loglist.xyz; - proxy_http_version 1.1; - proxy_pass http://localhost:9000/; - } -} - -server { - listen 443 ssl http2; - server_name *.loglist.xyz; - include /etc/nginx/ssl.conf; - - location / { - return 301 https://loglist.xyz$request_uri; - } -} - -server { - listen 80; - server_name loglist.xyz; - - location / { - rewrite ^(.*)$ https://loglist.xyz$1 permanent; - } -} - -server { - listen 80; - server_name *.loglist.xyz; - location / { - return 301 https://loglist.xyz$request_uri; - } -} diff --git a/ctor/etc/nginx/sites-available/tales b/ctor/etc/nginx/sites-available/tales deleted file mode 100644 index 6e86fea..0000000 --- a/ctor/etc/nginx/sites-available/tales +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 codingteam/devops contributors -# -# SPDX-License-Identifier: MIT - -server { - listen 443 ssl http2; - server_name tales.codingteam.org.ru; - include /etc/nginx/ssl.conf; - - location / { - alias /opt/codingteam/tales/; - index index.html; - } -} - -server { - listen 80; - server_name tales.codingteam.org.ru; - - location / { - rewrite ^(.*)$ https://tales.codingteam.org.ru$1 permanent; - } -} diff --git a/ctor/etc/nginx/ssl.conf b/ctor/etc/nginx/ssl.conf deleted file mode 100644 index 3e72804..0000000 --- a/ctor/etc/nginx/ssl.conf +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 codingteam/devops contributors -# -# SPDX-License-Identifier: MIT - -ssl_certificate /etc/letsencrypt/live/codingteam.org.ru-0001/fullchain.pem; -ssl_certificate_key /etc/letsencrypt/live/codingteam.org.ru-0001/privkey.pem; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; -ssl_ciphers "HIGH:!aNULL:!MD5:!kEDH"; -add_header Strict-Transport-Security 'max-age=15552000'; diff --git a/ctor/etc/systemd/system/cor-site.service b/ctor/etc/systemd/system/cor-site.service deleted file mode 100644 index f61b2b6..0000000 --- a/ctor/etc/systemd/system/cor-site.service +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -[Unit] -Description=codingteam.org.ru site -After=network.target - -[Service] -User=cor-site -WorkingDirectory=/opt/codingteam/codingteam.org.ru/ -ExecStart=/usr/bin/dotnet /opt/codingteam/codingteam.org.ru/codingteam.org.ru.dll - -[Install] -WantedBy=multi-user.target diff --git a/ctor/etc/systemd/system/loglist.service b/ctor/etc/systemd/system/loglist.service deleted file mode 100644 index 424f5d7..0000000 --- a/ctor/etc/systemd/system/loglist.service +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-FileCopyrightText: 2016-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -[Unit] -Description=loglist.xyz site -After=network.target - -[Service] -EnvironmentFile=/etc/loglist/loglist.conf -ExecStart=/opt/loglist/bin/loglist-jvm -Dhttp.port=9000 -Dhttp.address=127.0.0.1 - -[Install] -WantedBy=multi-user.target diff --git a/omnissiah/.gitignore b/omnissiah/.gitignore deleted file mode 100644 index 386575d..0000000 --- a/omnissiah/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -/chat-linker/app-config.json diff --git a/omnissiah/Host.md b/omnissiah/Host.md deleted file mode 100644 index 4aee1f2..0000000 --- a/omnissiah/Host.md +++ /dev/null @@ -1,16 +0,0 @@ - - -omnissiah -========= - -This is a machine hosted at [DATA EXPUNGED]. - -Enabled end-user services: - -- [chat-linker][] - -[chat-linker]: chat-linker/Readme.md diff --git a/omnissiah/chat-linker/Dockerfile b/omnissiah/chat-linker/Dockerfile deleted file mode 100644 index 9ab3cf1..0000000 --- a/omnissiah/chat-linker/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -FROM node:8.7.0-alpine -RUN apk update && apk add git -RUN git clone https://github.com/jt3k/chat-linker.git /usr/app && cd /usr/app && git checkout 4aab67aa6a59368896d427f14060c59484ff0a37 -RUN cd /usr/app && npm install && npm run build # TODO: Not stable enough; migrate to yarn -COPY app-config.json /usr/app/app-config.json -WORKDIR /usr/app -ENV NODE_ENV prod -CMD ["node", "dist/app.js"] diff --git a/omnissiah/chat-linker/Readme.md b/omnissiah/chat-linker/Readme.md deleted file mode 100644 index 1001fc1..0000000 --- a/omnissiah/chat-linker/Readme.md +++ /dev/null @@ -1,18 +0,0 @@ - - -chat-linker -=========== - -Deployment: - -1. Copy `app-config.example.json` to `app.config.json` and set up the - parameters. -2. Start Docker container: - - ```console - $ docker-compose up -d - ``` diff --git a/omnissiah/chat-linker/app-config.example.json b/omnissiah/chat-linker/app-config.example.json deleted file mode 100644 index 2182660..0000000 --- a/omnissiah/chat-linker/app-config.example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "jabber": { - "connection": { - "jid": "JABBERNAME@codingteam.org.ru", - "password": "JABBERPASSWORD", - "reconnect": true - }, - "dev": { - "room": "codingteam@conference.jabber.ru", - "nick": "tg", - "pingMs": 60000 - }, - "prod": { - "room": "codingteam@conference.jabber.ru", - "nick": "tg", - "pingMs": 60000 - } - }, - "telegram": { - "BOT_TOKEN": "TELEGRAMTOKEN", - "dev": {"id":TELEGRAMID,"title":"codingteam","type":"supergroup"}, - "prod": {"id":TELEGRAMID,"title":"codingteam","type":"supergroup"} - } -} diff --git a/omnissiah/chat-linker/app-config.example.json.license b/omnissiah/chat-linker/app-config.example.json.license deleted file mode 100644 index 22bbd7a..0000000 --- a/omnissiah/chat-linker/app-config.example.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2017-2025 Friedrich von Never - -SPDX-License-Identifier: MIT diff --git a/omnissiah/chat-linker/docker-compose.yml b/omnissiah/chat-linker/docker-compose.yml deleted file mode 100644 index 993c050..0000000 --- a/omnissiah/chat-linker/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: 2017-2025 Friedrich von Never -# -# SPDX-License-Identifier: MIT - -version: '2' -services: - linker: - build: . - restart: always