Compare commits

..

No commits in common. "bf255073352db2c65da930d1807dc2c07d28c8ec" and "f305379de249f22967b9937a3709efdea1511f7f" have entirely different histories.

12 changed files with 1 additions and 91 deletions

View File

@ -26,6 +26,3 @@
- name: CI - name: CI
ansible.builtin.import_playbook: playbooks/deploy-drone.yml ansible.builtin.import_playbook: playbooks/deploy-drone.yml
- name: Website for hatecomputers.club
ansible.builtin.import_playbook: playbooks/deploy-hatecomputers-club.yml

View File

@ -2,7 +2,3 @@
drone_gitea_server: "https://git.hatecomputers.club" drone_gitea_server: "https://git.hatecomputers.club"
drone_server_host: "https://ci.hatecomputers.club" drone_server_host: "https://ci.hatecomputers.club"
drone_admin_username: "gitea_admin"
drone_cpu_set: "1"
drone_memory_limit: "1000000000"
drone_workers: "2"

View File

@ -9,4 +9,3 @@ host_domains:
# - himmel.hatecomputers.club # - himmel.hatecomputers.club
- git.hatecomputers.club - git.hatecomputers.club
- ci.hatecomputers.club - ci.hatecomputers.club
- hatecomputers.club

View File

@ -32,6 +32,3 @@ himmel.int.infra.hatecomputers.club ansible_user=root ansible_connection=ssh
[drone] [drone]
himmel.int.infra.hatecomputers.club ansible_user=root ansible_connection=ssh himmel.int.infra.hatecomputers.club ansible_user=root ansible_connection=ssh
[hatecomputers-club]
himmel.int.infra.hatecomputers.club ansible_user=root ansible_connection=ssh

View File

@ -1,6 +0,0 @@
---
- name: hatecomputers.club setup
hosts: hatecomputers-club
roles:
- hatecomputers-club

View File

@ -16,7 +16,6 @@ services:
- DRONE_SERVER_PROTO=https - DRONE_SERVER_PROTO=https
- DRONE_SERVER_HOST={{ drone_server_host }} - DRONE_SERVER_HOST={{ drone_server_host }}
- DRONE_RPC_SECRET={{ drone_rpc_secret }} - DRONE_RPC_SECRET={{ drone_rpc_secret }}
- DRONE_USER_CREATE=username:{{ drone_admin_username }},admin:true
drone-runner: drone-runner:
container_name: drone_runner container_name: drone_runner
image: drone/drone-runner-docker:latest image: drone/drone-runner-docker:latest
@ -27,6 +26,4 @@ services:
- DRONE_RPC_SECRET={{ drone_rpc_secret }} - DRONE_RPC_SECRET={{ drone_rpc_secret }}
- DRONE_RPC_HOST=drone:80 - DRONE_RPC_HOST=drone:80
- DRONE_RPC_PROTO=http - DRONE_RPC_PROTO=http
- DRONE_RUNNER_CAPACITY={{ drone_workers }} - DRONE_RUNNER_CAPACITY=4
- DRONE_CPU_SET={{ drone_cpu_set }}
- DRONE_MEMORY_LIMIT={{ drone_memory_limit }}

View File

@ -1,23 +0,0 @@
---
- name: Ensure hatecomputers-club docker/compose exist
ansible.builtin.file:
path: /etc/docker/compose/hatecomputers-club
state: directory
owner: root
group: root
mode: 0700
- name: Build hatecomputers-club docker-compose.yml.j2
ansible.builtin.template:
src: docker-compose.yml.j2
dest: /etc/docker/compose/hatecomputers-club/docker-compose.yml
owner: root
group: root
mode: 0700
- name: Enable hatecomputers-club
ansible.builtin.systemd_service:
state: restarted
enabled: true
name: docker-compose@hatecomputers-club

View File

@ -1,14 +0,0 @@
version: '3'
services:
kanidm:
image: git.hatecomputers.club/hatecomputers/hatecomputers.club:main
restart: always
ports:
- 127.0.0.1:9696:8080
environment:
- CLOUDFLARE_TOKEN={{ cloudflare_api_token }}
- CLOUDFLARE_ZONE={{ cloudflare_zone_id }}
volumes:
- ./db:/app/db

View File

@ -1,8 +0,0 @@
server {
listen 80;
server_name hatecomputers.club;
location / {
rewrite ^ https://hatecomputers.club$request_uri? permanent;
}
}

View File

@ -17,8 +17,5 @@ server {
proxy_pass http://127.0.0.1:9966; proxy_pass http://127.0.0.1:9966;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
client_max_body_size 500M; # docker images can get large :3
client_body_buffer_size 128k;
} }
} }

View File

@ -1,21 +0,0 @@
server {
server_name hatecomputers.club;
listen 443 ssl;
ssl_dhparam /etc/nginx/dhparams.pem;
ssl_session_timeout 1d;
ssl_session_tickets off;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
ssl_prefer_server_ciphers off;
ssl_certificate /etc/letsencrypt/live/hatecomputers.club/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/hatecomputers.club/privkey.pem;
location / {
proxy_pass http://127.0.0.1:9696;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
}
}

View File

@ -1,5 +1,4 @@
cloudflare_api_token cloudflare_api_token
cloudflare_zone_id
certbot_email certbot_email
email_ldap_api_token email_ldap_api_token
roundcube_oauth2_client_id roundcube_oauth2_client_id