opendev
/
system-config
Code Issues Proposed changes

Merge "Use Apache to serve a local OpenDev logo on paste"

This commit is contained in:
Zuul 2021-09-21 23:28:04 +00:00 committed by Gerrit Code Review
parent fc75255ea9 1a227489e2
commit 7e030a32df
5 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/roles/lodgeit/files/opendev.svg Symbolic link
View File

@ -0,0 +1 @@
../../../../assets/opendev.svg

16
playbooks/roles/lodgeit/tasks/main.yaml
View File

@ -61,6 +61,22 @@
group: root
mode: 0755
- name: Create assets dir
file:
state: directory
path: /var/lib/lodgeit/www/assets
owner: root
group: root
mode: 0755
- name: Install OpenDev logo
copy:
src: opendev.svg
dest: /var/lib/lodgeit/www/assets/opendev.svg
owner: root
group: root
mode: 0644
- name: Install robots.txt
copy:
src: robots.txt

2
playbooks/roles/lodgeit/templates/docker-compose.yaml.j2
View File

@ -33,5 +33,5 @@ services:
environment:
LODGEIT_DBURI: 'mysql+pymysql://{{ lodgeit_db_username }}:{{ lodgeit_db_password }}@127.0.0.1:3306/{{ lodgeit_db_dbname }}'
LODGEIT_SECRET_KEY: '{{ lodgeit_secret_key }}'
LODGEIT_TITLE_OVERRIDE: '<img src="https://opendev.org/opendev/system-config/raw/branch/master/assets/opendev.svg" style="width: 100px; padding-bottom:10px; margin-left:20px;" alt="Opendev Pastebin">'
LODGEIT_TITLE_OVERRIDE: '<img src="/assets/opendev.svg" style="width: 100px; padding-bottom:10px; margin-left:20px;" alt="Opendev Pastebin">'

8
playbooks/roles/lodgeit/templates/paste.vhost.j2
View File

@ -31,12 +31,16 @@
ProxyPass / http://localhost:9000/ retry=0
ProxyPassReverse / http://localhost:9000/
<Location "/assets/">
ProxyPass !
</Location>
<Location "/robots.txt">
ProxyPass !
</Location>
<Directory "/var/lib/lodgeit/www">
Require all granted
</Directory>
Alias /assets /var/lib/lodgeit/www/assets
Alias /robots.txt /var/lib/lodgeit/www/robots.txt
</VirtualHost>
@ -74,12 +78,16 @@
RewriteCond %{QUERY_STRING} "method=pastes.getRecent"
RewriteRule .* - [F,L]
<Location "/assets/">
ProxyPass !
</Location>
<Location "/robots.txt">
ProxyPass !
</Location>
<Directory "/var/lib/lodgeit/www">
Require all granted
</Directory>
Alias /assets /var/lib/lodgeit/www/assets
Alias /robots.txt /var/lib/lodgeit/www/robots.txt
</VirtualHost>

6
testinfra/test_paste.py
View File

@ -45,6 +45,12 @@ def test_paste_redirects(host):
r = requests.get('http://%s' % (host.backend.get_hostname()))
assert r.status_code == 200
def test_paste_logo(host):
cmd = host.run('curl --insecure '
'--resolve paste.opendev.org:443:127.0.0.1 '
'https://paste.opendev.org/assets/opendev.svg')
assert 'image/svg+xml' in cmd.stdout
def test_paste_robots(host):
cmd = host.run('curl --insecure '
'--resolve paste.opendev.org:443:127.0.0.1 '