Commit Graph

8 Commits

Author SHA1 Message Date
James E. Blair 9fead30442 Use LE certs for zuul-ci.org
This switches the zuul-ci.org/zuulci.org vhost to use newly issued
letsencrypt certs.  It also does the same for git.zuul-ci.org, which
is a different vhost.  Since that vhost is tied into a configuration
which can't accept cert file paths (only content), adjust it to use
the newer "website" manifest pattern which can.

Change-Id: I0cd0407754466327147917390c578da336e61269
2020-01-07 15:25:32 -08:00
Clark Boylan fd97e061ae Evaluate files vhosts after we determine ssl file paths
Previously we evaluated the vhost templates before setting
ssl_cert_file_ and ssl_key_file_ and ssl_chain_file_. This made erb
unhappy because those are the three variables we use to set paths in the
vhost. Fix this by moving the vhost after the ssl file vars are set.

Change-Id: I4ba62521c9e7da104f8799d016cbcf0214cbdfc1
2019-06-06 16:28:37 -07:00
Clark Boylan 9ea8edc341 Evaluate files website vhosts in context of website not vhost
To deal with puppet scoping fun we evaluate the template for our
files.o.o website vhosts in the context of the website define and not in
the context of httpd::vhost.

Change-Id: I90bb881eb6ad78cede3a8a2548e1dfcf24e1160b
2019-06-06 15:12:15 -07:00
James E. Blair 3c84c65614 Add tarballs.opendev.org vhost
Change-Id: I6aa85bf92b2d5726d3c86b11b103a87f11953c51
2019-06-05 14:10:19 -07:00
James E. Blair 51dda0881f Serve docs.opendev.org from files.openstack.org
Change-Id: I2d69994b51bef96b7ba9b71b1a65d0a1956f9f73
2019-03-22 15:49:59 -07:00
Clark Boylan b7ff8d9c8c Allow project website volume path to be overridden
We've created a /afs/.openstack.org/project/starlingx.io volume for
starlingx to host specs and docs and whatever else. Currently they are
trying to set up docs.starlingx.io as a vhost to serve docs. This Means
the vhost name and volume path differ. Allow for specifying a volume
name that is different than the volume path in this case. The idea here
is to avoid needing to create separate afs volumes for different (but
related) content.

Change-Id: Iea6d38096f2b4c90feab56289003af29fd5c224d
2018-09-10 09:28:16 -07:00
James E. Blair c03b2df2ac Fix zuul-ci.org website def
We should use {} in templated strings to avoid confusion about
variable names.  Also, make sure the required cert files are in
place before trying to create a vhost.

Change-Id: I24ef5ffe347a4a389acb282ea3a41b87fb34f6bc
2018-01-22 13:55:01 -08:00
James E. Blair 7f014a0c3f Add website hosting infrastructure
And the zuul-ci.org website.  Note changes like this need ssl
certs added to private hiera before merging.  Creating the AFS
volume would also be a good idea.

The SSL certs are in hiera, and the AFS volume is mounted.

Change-Id: I1eccee119bf169fea265c53af4c8c016c13c03ec
Depends-On: Ic92726dc341af5802ad803d239bd547ef5068043
Story: 2001382
Task: 6093
2018-01-19 15:38:11 -08:00