diff --git a/playbooks/vps2.yml b/playbooks/vps2.yml index af77643..7978f80 100644 --- a/playbooks/vps2.yml +++ b/playbooks/vps2.yml @@ -97,14 +97,6 @@ - db.env - server.env ##### - # APP: hugo-chat, /apps/hugo-chat - ##### - - name: Create /apps/hugo-chat - ansible.builtin.file: - path: /apps/hugo-chat - state: directory - mode: "u=rwx,g=rx,o=rx" - ##### # APP: bisect-rustc-servce, /apps/bisect-rustc-service ##### - name: Create /apps/bisect-rustc-service diff --git a/secrets/vps2.env b/secrets/vps2.env index b26a265..18a4126 100644 Binary files a/secrets/vps2.env and b/secrets/vps2.env differ diff --git a/vps2/Caddyfile b/vps2/Caddyfile index a578d0b..3e3451c 100644 --- a/vps2/Caddyfile +++ b/vps2/Caddyfile @@ -48,15 +48,6 @@ docker.noratrieb.dev { reverse_proxy * localhost:5000 } -api.hugo-chat.nilstrieb.dev { - import cors https://hugo-chat.nilstrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type" - reverse_proxy * localhost:5001 -} - -hugo-chat.nilstrieb.dev { - reverse_proxy * localhost:5002 -} - api.cors-school.nilstrieb.dev { import cors https://cors-school.nilstrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,token,refresh-token,Authorization" reverse_proxy * localhost:5003 diff --git a/vps2/README.md b/vps2/README.md deleted file mode 100644 index f95260f..0000000 --- a/vps2/README.md +++ /dev/null @@ -1,8 +0,0 @@ -## ports - -- `5000`: registry -- `5001`: hugo-chat server -- `5002`: hugo-chat client -- `5003`: cors-school server -- `5004`: cors-school client -- `5005`: cargo-bisect-rustc-service \ No newline at end of file diff --git a/vps2/backup.sh b/vps2/backup.sh index 6779bbb..7a03e56 100755 --- a/vps2/backup.sh +++ b/vps2/backup.sh @@ -70,7 +70,7 @@ upload_file "killua/trivia_questions.json" #upload_file "uptime/uptime.db" upload_pg_dump "cors-school" "cors-school-db" "davinci" "postgres" -upload_pg_dump "hugo-chat" "hugo-chat-db" "postgres" "postgres" +#upload_pg_dump "hugo-chat" "hugo-chat-db" "postgres" "postgres" upload_pg_dump "openolat" "openolat-db" "oodb" "oodbu" # shellcheck disable=SC1091 diff --git a/vps2/docker-compose.yml b/vps2/docker-compose.yml index 321f42f..02d2757 100644 --- a/vps2/docker-compose.yml +++ b/vps2/docker-compose.yml @@ -40,34 +40,6 @@ services: - "5005:4000" networks: - prometheus - #### Hugo Chat - hugo_chat_db: - container_name: hugo-chat-db - image: "postgres:latest" - restart: always - volumes: - - "/apps/hugo-chat/data:/var/lib/postgresql/data" - environment: - POSTGRES_PASSWORD: "${HUGO_CHAT_DB_PASSWORD}" - PGDATA: "/var/lib/postgresql/data/pgdata" - networks: - - hugo-chat - hugo_chat_server: - container_name: hugo-chat-server - image: "docker.noratrieb.dev/hugo-chat-server:63bd1922" - ports: - - "5001:8080" - environment: - SPRING_DATASOURCE_URL: "jdbc:postgresql://hugo-chat-db:5432/postgres" - SPRING_DATASOURCE_PASSWORD: "${HUGO_CHAT_DB_PASSWORD}" - networks: - - hugo-chat - hugo_chat_client: - container_name: hugo-chat-client - image: "docker.noratrieb.dev/hugo-chat-client:63bd1922" - restart: always - ports: - - "5002:80" #### Karin karin_bot_db: container_name: karin-bot-db @@ -204,7 +176,6 @@ services: networks: cors-school: - hugo-chat: karin-bot: openolat-network: prometheus: