Put the new website live

ansible/main.yml

@@ -102,7 +102,6 @@
     - nebula
     - upload
     - plausible
-    - pages
     - restic
     - commento
     - website

ansible/roles/pages/files/docker-compose.yml

@@ -1,38 +0,0 @@
-version: "2.3"
-
-services:
-  webdav:
-    image: ghcr.io/realorangeone/webdav:latest
-    restart: unless-stopped
-    volumes:
-      - ./sites:/srv
-      - ./htpasswd.txt:/etc/nginx/.htpasswd:ro
-    environment:
-      - PUID={{ docker_user.id }}
-    networks:
-      - default
-      - traefik
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.pages.rule=Host(`pages.theorangeone.net`)
-
-  traefik-pages:
-    image: ghcr.io/realorangeone/traefik-pages:latest
-    volumes:
-      - ./sites:/sites:ro
-    restart: unless-stopped
-    user: "{{ docker_user.id }}"
-    environment:
-      - SITES_ROOT=/sites
-      - TRAEFIK_SERVICE=traefik-pages-pages@docker
-      - AUTH_PASSWORD={{ traefik_pages_password }}
-      - TRAEFIK_CERT_RESOLVER=le
-    networks:
-      - default
-      - traefik
-    labels:
-      - traefik.enable=true
-
-networks:
-  traefik:
-    external: true

ansible/roles/pages/handlers/main.yml

@@ -1,4 +0,0 @@
-- name: restart pages
-  shell:
-    chdir: /opt/pages
-    cmd: "{{ docker_update_command }}"

ansible/roles/pages/tasks/main.yml

@@ -1,50 +0,0 @@
-- name: Create install directory
-  file:
-    path: /opt/pages
-    state: directory
-    owner: "{{ docker_user.name }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Create sites directory
-  file:
-    path: /opt/pages/sites
-    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/pages/docker-compose.yml
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
-  notify: restart pages
-  become: true
-
-- name: Create superuser
-  htpasswd:
-    path: /opt/pages/htpasswd.txt
-    name: jake
-    password: "{{ superuser_password }}"
-    mode: 0640
-    owner: "{{ docker_user.name }}"
-  become: true
-
-- name: Create GitHub user
-  htpasswd:
-    path: /opt/pages/htpasswd.txt
-    name: github
-    password: "{{ github_user_password }}"
-    mode: 0640
-  become: true
-
-- name: Create status user
-  htpasswd:
-    path: /opt/pages/htpasswd.txt
-    name: status
-    password: "{{ status_user_password }}"
-    mode: 0640
-  become: true

ansible/roles/pages/vars/main.yml

@@ -1,34 +0,0 @@
-superuser_password: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  33323536323232653865636163386562663163653432613431336462656338336238366632636562
-  3234636362623836396632633063386165633933663733630a623930346562303165326566633263
-  65396433356339363430636536343538323966343731313735343738316566303662366264313639
-  6363313630333736640a376461643132343437623430373363303731376363643866386565623962
-  66313038346538613638306565366131613339346338613732633862376265353464383531323830
-  32626630356265396434303063383565306536613062373964303432363363373463353630353664
-  61313163396537653630346437346139613031343566636462653437646530643862633564636138
-  39323437303166633131646462336666376534383864623863626330346462363661336535323839
-  61336133633962303330383161383864373237633138353837613230306565323462
-github_user_password: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  37613664616532313936633565643530333933646661373538643131353832626537663839333962
-  6163376230356337666362663638336366353466333832350a376635653836373036353034633963
-  30373463636331623665363162306230303966656233396333323962303734643164646234643838
-  3836383834636261340a353761623461396264303939373339363434356461343037646630306566
-  35633261663639363862366533616236326463366131626337336135313036363236366332646361
-  36393863643039616439393862653261663134663138373164306263623666343036323033303262
-  38343763363363623334313735346230373135626337343437633833633230376466396663363233
-  32303562653733653334316439663230353031656132363661383166656639396235353838396535
-  31636364366363316339386131333530626462633765393033393666343763303366
-status_user_password: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  38383638393932323735303533393663386130653438353532383330346563353538333235643439
-  3030663365636138626432313832653265326436326261380a353331356636633231366337363163
-  32386431643665393263313332316439633562623738396565643364643165303865616636323531
-  6637343239346465360a626562373534396330643830393332306138633961663561323539363639
-  65613432383964386130393064663834613735656132303331353631623135393963333239356662
-  62653764616264663761333461393734303439363538353333613237333536366637366538353539
-  37613238343339346533386231336231663430316637323835666534646365376138653563653432
-  65373232623736396230326139653162353065326664653733623033613734643032643336663063
-  30616339326564383031633566653834656631376361663136343161393334303036
-traefik_pages_password: "{{ vault_traefik_pages_password }}"

ansible/roles/website/files/docker-compose.yml

@@ -16,7 +16,7 @@ x-website: &website
     - SPOTIFY_PROXY_HOST={{ spotify_proxy_host }}
     - UNSPLASH_CLIENT_ID={{ unsplash_client_id }}
     - SENTRY_DSN={{ website_sentry_dsn }}
-    - BASE_HOSTNAME=staging.theorangeone.net
+    - BASE_HOSTNAME=theorangeone.net
     - WEB_CONCURRENCY=4
     - SEO_INDEX=true
   volumes:
@@ -30,9 +30,7 @@ services:
     <<: *website
     labels:
       - traefik.enable=true
-      - traefik.http.routers.website.rule=Host(`staging.theorangeone.net`)
+      - traefik.http.routers.website.rule=Host(`theorangeone.net`)
-      - traefik.http.middlewares.website-auth.basicauth.users={{ website_basic_auth }}
-      - traefik.http.routers.website.middlewares=website-auth
     networks:
       - default
       - traefik

terraform/theorangeone.net.tf

@@ -165,14 +165,6 @@ resource "cloudflare_record" "theorangeonenet_plausible_bare" {
   ttl     = 1
 }
 
-resource "cloudflare_record" "theorangeonenet_pages" {
-  zone_id = cloudflare_zone.theorangeonenet.id
-  name    = "pages"
-  value   = vultr_instance.walker.main_ip
-  type    = "A"
-  ttl     = 1
-}
-
 resource "cloudflare_record" "theorangeonenet_notes" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "notes"