18 files changed, 2 insertions, 48 deletions
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 25d5b54..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/bionic64"
-
-  config.vm.network "forwarded_port", guest: 4000, host: 4000
-  config.vm.network "forwarded_port", guest: 80, host: 8080
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-
-  config.vm.provision "ansible" do |ansible|
-    ansible.limit = "all,localhost"
-    # ansible.verbose = "vvv"
-    ansible.playbook = "main.yaml"
-    ansible.compatibility_mode = "2.0"
-  end
-end
diff --git a/roles/nginx/defaults/main.yaml b/nginx/defaults/main.yaml
index c0db79d..c0db79d 100644
--- a/roles/nginx/defaults/main.yaml
+++ b/nginx/defaults/main.yaml
diff --git a/roles/nginx/handlers/main.yaml b/nginx/handlers/main.yaml
index 1feca07..1feca07 100644
--- a/roles/nginx/handlers/main.yaml
+++ b/nginx/handlers/main.yaml
diff --git a/roles/nginx/tasks/main.yaml b/nginx/tasks/main.yaml
index 5cace24..5cace24 100644
--- a/roles/nginx/tasks/main.yaml
+++ b/nginx/tasks/main.yaml
diff --git a/roles/pleroma-otp/defaults/main.yaml b/pleroma-otp/defaults/main.yaml
index 1726861..1726861 100644
--- a/roles/pleroma-otp/defaults/main.yaml
+++ b/pleroma-otp/defaults/main.yaml
diff --git a/roles/pleroma-otp/files/pleroma-s3-backup.sh b/pleroma-otp/files/pleroma-s3-backup.sh
index 7c1d6d3..7c1d6d3 100644
--- a/roles/pleroma-otp/files/pleroma-s3-backup.sh
+++ b/pleroma-otp/files/pleroma-s3-backup.sh
diff --git a/roles/pleroma-otp/files/[email protected] b/pleroma-otp/files/[email protected]
index a64cae3..a64cae3 100644
--- a/roles/pleroma-otp/files/[email protected]
+++ b/pleroma-otp/files/[email protected]
diff --git a/roles/pleroma-otp/files/[email protected] b/pleroma-otp/files/[email protected]
index 4967c63..4967c63 100644
--- a/roles/pleroma-otp/files/[email protected]
+++ b/pleroma-otp/files/[email protected]
diff --git a/roles/pleroma-otp/handlers/main.yaml b/pleroma-otp/handlers/main.yaml
index 0fad634..0fad634 100644
--- a/roles/pleroma-otp/handlers/main.yaml
+++ b/pleroma-otp/handlers/main.yaml
diff --git a/roles/pleroma-otp/tasks/main.yaml b/pleroma-otp/tasks/main.yaml
index 115db24..115db24 100644
--- a/roles/pleroma-otp/tasks/main.yaml
+++ b/pleroma-otp/tasks/main.yaml
diff --git a/roles/pleroma-otp/tasks/s3-backup.yaml b/pleroma-otp/tasks/s3-backup.yaml
index 12eaded..12eaded 100644
--- a/roles/pleroma-otp/tasks/s3-backup.yaml
+++ b/pleroma-otp/tasks/s3-backup.yaml
diff --git a/roles/pleroma-otp/templates/config.exs.j2 b/pleroma-otp/templates/config.exs.j2
index d94be00..d94be00 100644
--- a/roles/pleroma-otp/templates/config.exs.j2
+++ b/pleroma-otp/templates/config.exs.j2
diff --git a/roles/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 b/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2
index db4b255..db4b255 100644
--- a/roles/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2
+++ b/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2
diff --git a/roles/pleroma-otp/templates/pleroma.nginx.conf.j2 b/pleroma-otp/templates/pleroma.nginx.conf.j2
index 27c9165..af066ea 100644
--- a/roles/pleroma-otp/templates/pleroma.nginx.conf.j2
+++ b/pleroma-otp/templates/pleroma.nginx.conf.j2
@@ -13,16 +13,7 @@ server {
     listen {{nginx_port}};
     # listen [::]:{{nginx_port}};
     server_name {{nginx_server_name}};
-    return 301 https://$server_name$request_uri;
-
-    # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
-    # that you also create the .well-known/acme-challenge directory structure in pleroma/priv/static and
-    # that is is accessible by the webserver. You may need to load this file with the ssl
-    # server block commented out, run certbot to get the certificate, and then uncomment it.
-    #
-    # location ~ /\.well-known/acme-challenge {
-    #     root <path to install>/pleroma/priv/static/;
-    # }
+    return 301 https://$host$request_uri;
 }
 
 # Enable SSL session caching for improved performance
@@ -55,17 +46,6 @@ server {
     client_max_body_size 16m;
 
     location / {
-        # if you do not want remote frontends to be able to access your Pleroma backend
-        # server, remove these lines.
-        # add_header 'Access-Control-Allow-Origin' '*' always;
-        # add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always;
-        # add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always;
-        # add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always;
-        # if ($request_method = OPTIONS) {
-        #     return 204;
-        # }
-        # stop removing lines here.
-
         add_header X-XSS-Protection "1; mode=block";
         add_header X-Permitted-Cross-Domain-Policies none;
         add_header X-Frame-Options DENY;
@@ -73,8 +53,7 @@ server {
         add_header Referrer-Policy same-origin;
         add_header X-Download-Options noopen;
 
-        # Uncomment this only after you get HTTPS working.
-        # add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
 
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
diff --git a/roles/pleroma-otp/templates/setup_db.psql.j2 b/pleroma-otp/templates/setup_db.psql.j2
index 1b27174..1b27174 100644
--- a/roles/pleroma-otp/templates/setup_db.psql.j2
+++ b/pleroma-otp/templates/setup_db.psql.j2
diff --git a/roles/postgresql/defaults/main.yaml b/postgresql/defaults/main.yaml
index ff230a9..ff230a9 100644
--- a/roles/postgresql/defaults/main.yaml
+++ b/postgresql/defaults/main.yaml
diff --git a/roles/postgresql/handlers/main.yaml b/postgresql/handlers/main.yaml
index d2eb688..d2eb688 100644
--- a/roles/postgresql/handlers/main.yaml
+++ b/postgresql/handlers/main.yaml
diff --git a/roles/postgresql/tasks/main.yaml b/postgresql/tasks/main.yaml
index 6195840..6195840 100644
--- a/roles/postgresql/tasks/main.yaml
+++ b/postgresql/tasks/main.yaml