diff --git a/ansible/host_vars/walker/main.yml b/ansible/host_vars/walker/main.yml index 77540e6..b652f6f 100644 --- a/ansible/host_vars/walker/main.yml +++ b/ansible/host_vars/walker/main.yml @@ -6,8 +6,6 @@ nginx_https_redirect: true certbot_certs: - domains: - theorangeone.net - - domains: - - commento.theorangeone.net - domains: - plausible.theorangeone.net - elbisualp.theorangeone.net diff --git a/ansible/main.yml b/ansible/main.yml index dad799f..d97fe09 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -109,7 +109,6 @@ - coredns_docker_proxy - plausible - restic - - commento - website - artis3n.tailscale - slides diff --git a/ansible/roles/commento/files/docker-compose.yml b/ansible/roles/commento/files/docker-compose.yml deleted file mode 100644 index 15bb4b0..0000000 --- a/ansible/roles/commento/files/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -services: - commento: - image: ghcr.io/souramoo/commentoplusplus:latest - restart: unless-stopped - depends_on: - - db - networks: - - default - - coredns - environment: - - COMMENTO_POSTGRES=postgres://commento:commento@db:5432/commento?sslmode=disable - - COMMENTO_ORIGIN=https://commento.theorangeone.net - - COMMENTO_GZIP_STATIC=true - - COMMENTO_FORBID_NEW_OWNERS=true - - COMMENTO_GITHUB_KEY={{ vault_commento_github_client_id }} - - COMMENTO_GITHUB_SECRET={{ vault_commento_github_client_secret }} - - COMMENTO_SMTP_HOST=smtp.eu.mailgun.org - - COMMENTO_SMTP_PORT=587 - - COMMENTO_SMTP_USERNAME={{ vault_commento_smtp_username }} - - COMMENTO_SMTP_PASSWORD={{ vault_commento_smtp_password }} - - COMMENTO_SMTP_FROM_ADDRESS={{ vault_commento_from_email }} - - COMMENTO_GITLAB_KEY={{ vault_commento_gitlab_application_id }} - - COMMENTO_GITLAB_SECRET={{ vault_commento_gitlab_application_secret }} - - db: - image: postgres:14-alpine - restart: unless-stopped - volumes: - - ./postgres:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=commento - - POSTGRES_USER=commento - -networks: - coredns: - external: true diff --git a/ansible/roles/commento/handlers/main.yml b/ansible/roles/commento/handlers/main.yml deleted file mode 100644 index 58a1e1e..0000000 --- a/ansible/roles/commento/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart commento - shell: - chdir: /opt/commento - cmd: "{{ docker_update_command }}" diff --git a/ansible/roles/commento/tasks/main.yml b/ansible/roles/commento/tasks/main.yml deleted file mode 100644 index 5ad1d14..0000000 --- a/ansible/roles/commento/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ -- name: Include vault - include_vars: vault.yml - -- name: Create install directory - file: - path: /opt/commento - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install compose file - template: - src: files/docker-compose.yml - dest: /opt/commento/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: docker-compose -f %s config - notify: restart commento - become: true - -- name: Install nginx config - template: - src: files/nginx-docker.conf - dest: /etc/nginx/http.d/commento.conf - mode: "0644" - notify: reload nginx - become: true - vars: - server_name: commento.theorangeone.net - upstream: commento-commento-1.docker:8080 - ssl_cert_path: /etc/letsencrypt/live/commento.theorangeone.net diff --git a/ansible/roles/commento/vars/vault.yml b/ansible/roles/commento/vars/vault.yml deleted file mode 100644 index 7e7ed53..0000000 --- a/ansible/roles/commento/vars/vault.yml +++ /dev/null @@ -1,32 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -35343736363532306236303339356634316461383639333836393761356165633662326332613666 -3830323961313939316336393566363163646538623532310a363165666238653535353236383839 -35363730353939656330346639323331393562393339393562383034663231396164333261646438 -6564336362306636300a613634336337326534626263386466626238343130633864623862336563 -66326262613330373035663863663532626437303435333432383839303331333538363139643633 -64633465383135653265393033656135356166323238356130353633363030396366613164303033 -63303832376462616464333031366337626564633135386230313538353166343532643035336636 -31336531643766346438653333376364316162313765656330666330643261653433363339323665 -30623164373931336238303265316665373361336338346336646439356538333266393934343139 -34643433326330386564653461626264626231353863333935313665663462323234666463306266 -38626538666262333934393733626562313432393566643435376163653432613363663035333165 -36616431363563663235646433343564346164393034613436666362383233646636373163616666 -36376133346634653738376137393265303261626562366666303137313338633237313834386432 -66643264643532306364366562333837366636616237653033306538663435316163613266343565 -31633437353963313733326339666331323061363963303132363262343966653433303835323337 -31313363366631313930633061346265633261643238313762353932623230353938656264323437 -39346634383135306135326338616664336435343235383863393830386662393036383161303465 -33353261613537666464313437613335643830343336343535646665356333616266666233353065 -64313131306663313064633631663536386531343733643534336631666266613165313330653962 -35346262373437623333333234383531633238343463653862663236666337363738303463373664 -62343363323465313561376232633630303965306238316161383139316133343233343033376262 -63303264366536346234383063653838353638313561626433616462383339326631643533356639 -39653762633733363237383762356134366264356437346430343830616233373732616261613231 -62646639353132653038303536613738373137623236616631643738323737383637313633396135 -37613037313437613836336332346162383832613938356638333564346237373032356438363464 -31343464306131393362343433316666366632633036653262633361333165643735393231623932 -31643261326266323232383630353534326662303965393161343938663131343263363461303430 -31376161393038376262616333333362323033313436396164313438613532663564623633303365 -32656630663834633039316561663231656131383535653766316138313138346363633537373164 -62333532316135303366386261613131333364383031346364303938356631393865396133386633 -636462653562653538636531356537353133 diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index edb75c1..f793199 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -181,14 +181,6 @@ resource "cloudflare_record" "theorangeonenet_google_site_verification" { ttl = 1 } -resource "cloudflare_record" "theorangeonenet_commento" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "commento" - value = cloudflare_record.sys_domain_walker.hostname - type = "CNAME" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_mailgun_spf" { zone_id = cloudflare_zone.theorangeonenet.id name = "mg"