From f7afaacbdc8926400aa36119f86a49b65b9e33fa Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 9 Oct 2020 21:35:57 +0100
Subject: [PATCH] Move website to be hosted on GitLab pages

---
 ansible/main.yml                                |  1 -
 .../roles/gitlab_pages/files/docker-compose.yml |  4 ++++
 ansible/roles/website/files/docker-compose.yml  |  9 ---------
 ansible/roles/website/handlers/main.yml         |  4 ----
 ansible/roles/website/tasks/main.yml            | 17 -----------------
 5 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 ansible/roles/website/files/docker-compose.yml
 delete mode 100644 ansible/roles/website/handlers/main.yml
 delete mode 100644 ansible/roles/website/tasks/main.yml

diff --git a/ansible/main.yml b/ansible/main.yml
index d2e502f..89c297c 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -50,7 +50,6 @@
   roles:
     - contessa
     - upload
-    - website
     - duplicati
     - gitlab_pages
     - deluge
diff --git a/ansible/roles/gitlab_pages/files/docker-compose.yml b/ansible/roles/gitlab_pages/files/docker-compose.yml
index 4be7d14..6cf7f20 100644
--- a/ansible/roles/gitlab_pages/files/docker-compose.yml
+++ b/ansible/roles/gitlab_pages/files/docker-compose.yml
@@ -35,6 +35,10 @@ services:
       - traefik.http.routers.gitlab-pages-notes.tls.certresolver=le
       - traefik.http.routers.gitlab-pages-notes.service=gitlab-pages-gitlab-pages
 
+      - traefik.http.routers.gitlab-pages-website.rule=Host(`theorangeone.net`) || Host(`www.theorangeone.net`)
+      - traefik.http.routers.gitlab-pages-website.tls.certresolver=le
+      - traefik.http.routers.gitlab-pages-website.service=gitlab-pages-gitlab-pages
+
   ssh-server:
     image: linuxserver/openssh-server:latest
     environment:
diff --git a/ansible/roles/website/files/docker-compose.yml b/ansible/roles/website/files/docker-compose.yml
deleted file mode 100644
index 3c9b4c0..0000000
--- a/ansible/roles/website/files/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "2.3"
-services:
-  website:
-    image: docker.pkg.github.com/realorangeone/theorangeone.net/theorangeone.net:latest
-    restart: unless-stopped
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.website.rule=Host(`theorangeone.net`) || Host(`www.theorangeone.net`)
-      - traefik.http.routers.website.tls.certresolver=le
diff --git a/ansible/roles/website/handlers/main.yml b/ansible/roles/website/handlers/main.yml
deleted file mode 100644
index e536071..0000000
--- a/ansible/roles/website/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: restart website
-  shell:
-    chdir: /opt/theorangeone.net
-    cmd: "{{ docker_update_command }}"
diff --git a/ansible/roles/website/tasks/main.yml b/ansible/roles/website/tasks/main.yml
deleted file mode 100644
index 7ceb913..0000000
--- a/ansible/roles/website/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- name: Create install directory
-  file:
-    path: /opt/theorangeone.net
-    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/theorangeone.net/docker-compose.yml
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ docker_user.name }}"
-    validate: /usr/bin/docker-compose -f %s config
-  notify: restart website
-  become: true