GitLab upgraded to 13.0.0-ee.0 - changelog: https://gitlab.com/gitlab-org/gitlab/blob/master/CHANGELOG-EE.md

Unverified Commit 929b79b5 authored by Lance Albertson's avatar Lance Albertson Committed by GitHub

Add CentOS 8 to CI pipeline (#674)

* Add CentOS 8 to CI pipeline

* Update welcome.conf.erb for CentOS 8

The paths changed slightly on CentOS 8 which was causing issues with rendering
the page properly.

* Update changelog
parent 65d75986
......@@ -43,6 +43,7 @@ jobs:
- 'debian-8'
- 'debian-9'
- 'centos-7'
- 'centos-8'
- 'ubuntu-1604'
- 'ubuntu-1804'
- 'opensuse-leap-15'
......
......@@ -2,6 +2,10 @@
This file is used to list changes made in each version of the apache2 cookbook.
## Unreleased
- Add CentOS 8 to CI pipeline
## [8.1.0] - 2020-03-06
### Added
......
......@@ -32,6 +32,11 @@ platforms:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
- name: centos-8
driver:
image: dokken/centos-8
pid_one_command: /usr/lib/systemd/systemd
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-16.04
......
......@@ -18,6 +18,7 @@ platforms:
driver_config:
box: ywatase/amzn2
- name: centos-7
- name: centos-8
- name: debian-8
- name: debian-9
- name: opensuse-leap-15
......
......@@ -47,8 +47,16 @@ DocumentRoot "<%= @docroot_dir %>"
Require all granted
</Directory>
<% if node['platform_version'].to_i == 8 -%>
Alias /.noindex.html /usr/share/httpd/noindex/index.html.en-US
Alias /noindex/css/bootstrap.min.css /usr/share/httpd/noindex/common/css/bootstrap.min.css
Alias /noindex/css/open-sans.css /usr/share/httpd/noindex/common/css/styles.css
Alias /noindex/common/images/pb-apache.png /usr/share/httpd/noindex/common/images/pb-apache.png
Alias /noindex/common/images/pb-centos.png /usr/share/httpd/noindex/common/images/pb-centos.png
<% else -%>
Alias /.noindex.html /usr/share/httpd/noindex/index.html
Alias /noindex/css/bootstrap.min.css /usr/share/httpd/noindex/css/bootstrap.min.css
Alias /noindex/css/open-sans.css /usr/share/httpd/noindex/css/open-sans.css
Alias /images/apache_pb.gif /usr/share/httpd/noindex/images/apache_pb.gif
Alias /images/poweredby.png /usr/share/httpd/noindex/images/poweredby.png
<% end -%>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment