diff options
| author | Sacha Chua <sacha@sachachua.com> | 2025-09-19 14:10:17 -0400 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2025-09-19 14:10:17 -0400 |
| commit | a0fa0103497434808ceabfb1ef443726224060f6 (patch) | |
| tree | 26a23c8b79f3621da9a56a00c11b3e962af315e8 /roles/pad-proxy | |
| parent | e09651348ef9a21a52c434e65745535478051a85 (diff) | |
| download | emacsconf-ansible-a0fa0103497434808ceabfb1ef443726224060f6.tar.xz emacsconf-ansible-a0fa0103497434808ceabfb1ef443726224060f6.zip | |
tweak pad and pad proxy so I can replicate it in a vagrant VM
Diffstat (limited to '')
| -rw-r--r-- | roles/pad-proxy/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/pad-proxy/templates/etherpad.nginx.conf | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/pad-proxy/tasks/main.yml b/roles/pad-proxy/tasks/main.yml index 8de72df..1e4518a 100644 --- a/roles/pad-proxy/tasks/main.yml +++ b/roles/pad-proxy/tasks/main.yml @@ -2,6 +2,10 @@ - name: Set up Nginx as root become: true block: + - name: Remove apache + apt: + name: apache2 + state: absent - name: Install Nginx apt: name: nginx diff --git a/roles/pad-proxy/templates/etherpad.nginx.conf b/roles/pad-proxy/templates/etherpad.nginx.conf index 144185f..dc2879d 100644 --- a/roles/pad-proxy/templates/etherpad.nginx.conf +++ b/roles/pad-proxy/templates/etherpad.nginx.conf @@ -49,7 +49,7 @@ server { proxy_pass http://etherpad_upstream; } location / { - rewrite ^/?$ https://pad.emacsconf.org/{{ emacsconf_year }} redirect; + rewrite ^/?$ {{ etherpad_url }}/{{ emacsconf_year }} redirect; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; |