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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2015-07-27 18:19:22 +00:00
commit 96d356493b
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/httpd/newvirtualhost.conf.j2
View file

@ -45,7 +45,7 @@
# when the CA certificates are directly appended to the server # when the CA certificates are directly appended to the server
# certificate for convinience. # certificate for convinience.
#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt #SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
{% if sslintermediatecertfile is defined %} {% if sslintermediatecertfile != '' %}
SSLCertificateChainFile /etc/pki/tls/certs/{{ sslintermediatecertfile }} SSLCertificateChainFile /etc/pki/tls/certs/{{ sslintermediatecertfile }}
{% endif %} {% endif %}

4
inventory/inventory
View file

@ -42,9 +42,6 @@ arm01-retrace01.arm.fedoraproject.org
retrace01.qa.fedoraproject.org retrace01.qa.fedoraproject.org
retrace02.qa.fedoraproject.org retrace02.qa.fedoraproject.org
[app-stg]
app01.stg.phx2.fedoraproject.org
[ask] [ask]
ask01.phx2.fedoraproject.org ask01.phx2.fedoraproject.org
ask02.phx2.fedoraproject.org ask02.phx2.fedoraproject.org
@ -518,7 +515,6 @@ junk01.phx2.fedoraproject.org
# All staging hosts should be in this group too. # All staging hosts should be in this group too.
# #
[staging] [staging]
app01.stg.phx2.fedoraproject.org
ask01.stg.phx2.fedoraproject.org ask01.stg.phx2.fedoraproject.org
badges-backend01.stg.phx2.fedoraproject.org badges-backend01.stg.phx2.fedoraproject.org
badges-web01.stg.phx2.fedoraproject.org badges-web01.stg.phx2.fedoraproject.org

4
roles/hosts/files/sundries01.phx2.fedoraproject.org-hosts Normal file
View file

@ -0,0 +1,4 @@
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
10.5.126.23 infrastructure.fedoraproject.org
209.132.182.71 fedora.zanata.org