Add a new hostname variable for pdc

This commit is contained in:
Pierre-Yves Chibon 2015-09-30 09:01:56 +02:00
parent 262f5b125b
commit 12c2e0f6ff
3 changed files with 4 additions and 3 deletions

View file

@ -9,6 +9,7 @@ tcp_ports: [22, 80, 443]
inventory_tenant: persistent
inventory_instance_name: pdc
hostbase: pdc.fedorainfracloud.org
hostname: pdc.fedorainfracloud.org
public_ip: 209.132.184.106
root_auth_users: pingou
description: pdc development instance

View file

@ -2,8 +2,8 @@ WSGISocketPrefix /var/run/wsgi
WSGIPythonOptimize 1
WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes=2 threads=1 shutdown-timeout=10
<VirtualHost {{ hostbase }}:80>
ServerName {{ hostbase }}
<VirtualHost {{ hostname }}:80>
ServerName {{ hostname }}
CustomLog /var/log/httpd/pdc-access.log combined
ErrorLog /var/log/httpd/pdc-error.log

View file

@ -84,7 +84,7 @@ REST_API_VERSION = 'v1'
BROWSABLE_DOCUMENT_MACROS = {
# need to be rewrite with the real host name when deploy.
'HOST_NAME': 'http://{{ hostbase }}:80',
'HOST_NAME': 'http://{{ hostname }}:80',
# make consistent with rest api root.
'API_PATH': '%s%s' % (REST_API_URL, REST_API_VERSION),
}