--- a/.hgignore	Thu Aug 16 20:25:56 2018 -0500
+++ b/.hgignore	Mon Aug 20 10:22:45 2018 -0500
@@ -6,4 +6,4 @@
 \.terraform/
 TAGS$
 tags$
-^group_vars/
+^inventory/

--- a/Vagrantfile	Thu Aug 16 20:25:56 2018 -0500
+++ b/Vagrantfile	Mon Aug 20 10:22:45 2018 -0500
@@ -5,6 +5,7 @@
   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|
@@ -18,7 +19,7 @@
   config.vm.provision "ansible" do |ansible|
     ansible.limit = "all,localhost"
     # ansible.verbose = "vvv"
-    ansible.playbook = "vagrant.yaml"
+    ansible.playbook = "main.yaml"
     ansible.compatibility_mode = "2.0"
   end
 end

--- a/ansible.cfg	Thu Aug 16 20:25:56 2018 -0500
+++ b/ansible.cfg	Mon Aug 20 10:22:45 2018 -0500
@@ -1,15 +1,17 @@
 [defaults]
-remote_tmp = ~/.ansible/tmp
+inventory = ./inventory
+
+#remote_tmp = ~/.ansible/tmp
 
 retry_files_enabled = false
 roles_path = ./roles
-become_flags = -H -S -n -E
-squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper
-merge_multiple_cli_flags = true
+#become_flags = -H -S -n -E
+#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper
+#merge_multiple_cli_flags = true
 
 # SSH
-timeout = 10
-executable = /bin/bash
+#timeout = 10
+#executable = /bin/bash
 host_key_checking = False
 #remote_port    = 22
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.yaml	Mon Aug 20 10:22:45 2018 -0500
@@ -0,0 +1,14 @@
+---
+
+- name: setup python2
+  hosts: all
+  gather_facts: no
+  tasks:
+    - name: install python2
+      become: yes
+      raw: "apt-get install python -y"
+
+- hosts: all
+  roles:
+    - nginx
+    - pleroma

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roles/nginx/defaults/main.yaml	Mon Aug 20 10:22:45 2018 -0500
@@ -0,0 +1,6 @@
+---
+
+nginx_enable_ssl: No
+nginx_port: 80
+nginx_ssl_port: 443
+nginx_server_name: "{{ansible_host}}"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roles/nginx/handlers/main.yaml	Mon Aug 20 10:22:45 2018 -0500
@@ -0,0 +1,4 @@
+---
+- name: restart nginx
+  become: yes
+  systemd: name="nginx" state="restarted" daemon_reload="yes"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roles/nginx/tasks/certbot.yaml	Mon Aug 20 10:22:45 2018 -0500
@@ -0,0 +1,17 @@
+---
+
+# https://certbot.eff.org/lets-encrypt/ubuntuxenial-nginx
+
+- name: add certbot (letsencrypt) repo
+  become: yes
+  apt_repository: repo="ppa:certbot/certbot"
+
+- name: install nginx packages
+  become: yes
+  apt: name="python-certbot-nginx"
+  notify: restart nginx
+
+- name: install certbot in nginx
+  become: yes
+  command: "certbot certonly --nginx -n --agree-tos -d {{nginx_server_name}} -m {{nginx_admin_email}}"
+  notify: restart nginx

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roles/nginx/tasks/main.yaml	Mon Aug 20 10:22:45 2018 -0500
@@ -0,0 +1,38 @@
+---
+
+- name: set hostname in OS
+  become: yes
+  hostname: name="{{inventory_hostname}}"
+
+- name: change timezone to UTC
+  become: yes
+  timezone: name="UTC"
+
+- name: install nginx packages
+  become: yes
+  apt: name="nginx"
+
+- name: disable default site
+  become: yes
+  file: path="/etc/nginx/sites-enabled/default" state="absent"
+  notify: restart nginx
+
+- name: install site
+  become: yes
+  template: src="{{nginx_conf_src}}" dest="/etc/nginx/sites-available/{{nginx_conf_dst}}"
+  notify: restart nginx
+
+- import_tasks: certbot.yaml
+  when: nginx_enable_ssl
+
+- name: enable site
+  become: yes
+  file:
+    src:  "/etc/nginx/sites-available/{{nginx_conf_dst}}"
+    dest: "/etc/nginx/sites-enabled/{{nginx_conf_dst}}"
+    state: "link"
+  notify: restart nginx
+
+- name: enable nginx service
+  become: yes
+  systemd: name="nginx" enabled="yes" state="started"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roles/pleroma/templates/pleroma.nginx.conf.j2	Mon Aug 20 10:22:45 2018 -0500
@@ -0,0 +1,95 @@
+# default nginx site config for Pleroma
+#
+# Simple installation instructions:
+# 1. Install your TLS certificate, possibly using Let's Encrypt.
+# 2. Replace 'example.tld' with your instance's domain wherever it appears.
+# 3. Copy this file to /etc/nginx/sites-available/ and then add a symlink to it
+#    in /etc/nginx/sites-enabled/ and run 'nginx -s reload' or restart nginx.
+
+proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g
+                 inactive=720m use_temp_path=off;
+
+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/;
+    # }
+}
+
+# Enable SSL session caching for improved performance
+ssl_session_cache shared:ssl_session_cache:10m;
+
+server {
+    listen {{nginx_ssl_port}} ssl http2;
+    listen [::]:{{nginx_ssl_port}} ssl ipv6only=on;
+    server_name {{nginx_server_name}};
+
+    ssl_certificate /etc/letsencrypt/live/{{nginx_server_name}}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/{{nginx_server_name}}/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+    ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
+    ssl_stapling on;
+    ssl_stapling_verify on;
+
+    add_header Strict-Transport-Security "max-age=31536000" always;
+
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
+
+    # the nginx default is 1m, not enough for large media uploads
+    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;
+        add_header X-Content-Type-Options nosniff;
+        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";
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $http_host;
+
+        proxy_pass {{nginx_proxy}};
+
+        client_max_body_size 16m;
+    }
+
+    location /proxy {
+        proxy_cache pleroma_media_cache;
+        proxy_cache_lock on;
+        proxy_ignore_client_abort on;
+        proxy_pass {{nginx_proxy}};
+    }
+}

--- a/vagrant.yaml	Thu Aug 16 20:25:56 2018 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
----
-
-- name: setup python2
-  hosts: all
-  gather_facts: no
-  tasks:
-    - name: install python2
-      become: yes
-      raw: "apt-get install python -y"
-
-- hosts: all
-  roles:
-    - pleroma