From aa96ceb9f5481a4da9f4a16dff92d05acc48687d Mon Sep 17 00:00:00 2001
From: ChrisJL <ChrisLovering@users.noreply.github.com>
Date: Sat, 12 Aug 2023 19:01:01 +0100
Subject: Serve static files from Turing (#116)

* Redirect http requests to https

* Remove default NGINX site

* Remove trailing whitespace from old meeting note

* Mount static files

* Correct capitalisation of notify directives

* Add missing children key to inventory
---
 roles/nginx/files/default_server.conf |  8 ++++++++
 roles/nginx/files/files.pydis.wtf     | 10 ++++++++++
 roles/nginx/tasks/main.yml            | 25 ++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 roles/nginx/files/files.pydis.wtf

(limited to 'roles/nginx')

diff --git a/roles/nginx/files/default_server.conf b/roles/nginx/files/default_server.conf
index 13e74a0..1d68ff5 100644
--- a/roles/nginx/files/default_server.conf
+++ b/roles/nginx/files/default_server.conf
@@ -1,4 +1,12 @@
 # Managed by Ansible
+server {
+  listen 80 default_server;
+
+  server_name _;
+
+  return 301 https://$host$request_uri;
+}
+
 server {
   listen 443 ssl http2 default_server;
 
diff --git a/roles/nginx/files/files.pydis.wtf b/roles/nginx/files/files.pydis.wtf
new file mode 100644
index 0000000..db8416e
--- /dev/null
+++ b/roles/nginx/files/files.pydis.wtf
@@ -0,0 +1,10 @@
+# Managed by Ansible
+server {
+  listen      443;
+  server_name files.pydis.wtf;
+  root        /var/www/turing;
+
+  location / {
+    try_files $uri $uri/;
+  }
+}
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 266e916..85fe7ec 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -19,4 +19,27 @@
   tags:
     - role::nginx
   notify:
-    - reload the nginx service
+    - Reload the nginx service
+
+- name: Remove default nginx site
+  file:
+    path: /etc/nginx/sites-enabled/default
+    state: absent
+
+- name: Copy file server config
+  copy:
+    src: files.pydis.wtf
+    dest: /etc/nginx/sites-available/files.pydis.wtf
+    group: root
+    owner: root
+    mode: "0644"
+  tags:
+    - role::nginx
+  notify:
+    - Reload the nginx service
+
+- name: Enable file server
+  file:
+    src: /etc/nginx/sites-available/files.pydis.wtf
+    dest: /etc/nginx/sites-enabled/files.pydis.wtf
+    state: link
-- 
cgit v1.2.3