From a11a97e981c8d940e27bd6ba434f4a924bcd7f60 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Tue, 28 Apr 2020 16:10:44 -0700
Subject: [PATCH] Meetpad: redirect 80 to 443

This should redirect meetpad connections on port 80 to port 443.

Change-Id: Ibfee9d9e6efbbac01ccf8363909a4da772a4dc42
---
 playbooks/roles/jitsi-meet/files/default.conf | 13 +++++++++++++
 playbooks/roles/jitsi-meet/tasks/main.yaml    |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/roles/jitsi-meet/files/default.conf

diff --git a/playbooks/roles/jitsi-meet/files/default.conf b/playbooks/roles/jitsi-meet/files/default.conf
new file mode 100644
index 0000000000..225dd2ce0a
--- /dev/null
+++ b/playbooks/roles/jitsi-meet/files/default.conf
@@ -0,0 +1,13 @@
+server {
+        listen 80 default_server;
+
+        return 301 https://$host$request_uri;
+}
+
+
+server {
+        listen 443 ssl;
+
+        include /config/nginx/ssl.conf;
+        include /config/nginx/meet.conf;
+}
diff --git a/playbooks/roles/jitsi-meet/tasks/main.yaml b/playbooks/roles/jitsi-meet/tasks/main.yaml
index 8e9c649b01..0adc0f5ceb 100644
--- a/playbooks/roles/jitsi-meet/tasks/main.yaml
+++ b/playbooks/roles/jitsi-meet/tasks/main.yaml
@@ -13,11 +13,16 @@
   loop:
     - web
     - web/nginx
+    - web/nginx/site-confs
 - name: Write web config
   copy:
     src: config.js
     dest: /var/jitsi-meet/web/config.js
-- name: Write nginx config
+- name: Write nginx site config
+  copy:
+    src: default.conf
+    dest: /var/jitsi-meet/web/nginx/site-confs/default
+- name: Write nginx meet config
   copy:
     src: meet.conf
     dest: /var/jitsi-meet/web/nginx/meet.conf