Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Drop 1wk expiry in stage, make httpd config a template and drop /login redirect in stg

Browse source 
Signed-off-by: Ricky Elrod <relrod@redhat.com>
This commit is contained in:
Ricky Elrod 2018-04-04 19:54:05 +00:00
parent d234533b90
commit 68c4d47f8a
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/modernpaste/tasks/main.yml
View file

@ -42,7 +42,7 @@
notify: reload httpd notify: reload httpd
- name: modernpaste apache config - name: modernpaste apache config
copy: src=modern-paste.conf dest=/etc/httpd/conf.d/modern-paste.conf owner=root group=root mode=644 template: src=modern-paste.conf dest=/etc/httpd/conf.d/modern-paste.conf owner=root group=root mode=644
tags: tags:
- config - config
- modernpaste - modernpaste
@ -50,6 +50,7 @@
- name: Apply modernpaste hotfixes for forcing 1 week expiry (1) - name: Apply modernpaste hotfixes for forcing 1 week expiry (1)
copy: src=post.html dest=/usr/share/modern-paste/app/templates/paste/post.html owner=root group=root mode=644 copy: src=post.html dest=/usr/share/modern-paste/app/templates/paste/post.html owner=root group=root mode=644
when: env != 'staging'
tags: tags:
- hotfix - hotfix
- modernpaste - modernpaste
@ -57,6 +58,7 @@
- name: Apply modernpaste hotfixes for forcing 1 week expiry (2) - name: Apply modernpaste hotfixes for forcing 1 week expiry (2)
copy: src=paste.py dest=/usr/share/modern-paste/app/api/paste.py owner=root group=root mode=644 copy: src=paste.py dest=/usr/share/modern-paste/app/api/paste.py owner=root group=root mode=644
when: env != 'staging'
tags: tags:
- hotfix - hotfix
- modernpaste - modernpaste

3
roles/modernpaste/files/modern-paste.conf → roles/modernpaste/templates/modern-paste.conf
View file

@ -108,7 +108,10 @@ WSGISocketPrefix run/wsgi
RewriteEngine on RewriteEngine on
#LogLevel alert rewrite:trace6 #LogLevel alert rewrite:trace6
{% if env != 'staging' %}
RewriteRule login / [L,R] RewriteRule login / [L,R]
{% endif %}
RewriteCond %{HTTP_USER_AGENT} ^fpaste\/0\.3.*$ [OR] RewriteCond %{HTTP_USER_AGENT} ^fpaste\/0\.3.*$ [OR]
RewriteCond %{HTTP_USER_AGENT} ^Python\-urllib.*$ RewriteCond %{HTTP_USER_AGENT} ^Python\-urllib.*$