diff --git a/doc/source/admin/customize-configure.rst b/doc/source/admin/customize-configure.rst
index 26bc9d0e32..a05423be8d 100644
--- a/doc/source/admin/customize-configure.rst
+++ b/doc/source/admin/customize-configure.rst
@@ -339,78 +339,70 @@ Use a domain that fits your current setup.
**Example Before**
- .. code-block:: apacheconf
+ .. code-block:: none
WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi.py
WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10
Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
-
- # For Apache http server 2.2 and earlier:
- Order allow,deny
- Allow from all
-
- # For Apache http server 2.4 and later:
- # Require all granted
-
+
+ =2.4>
+ Require all granted
+
+
+ Order allow,deny
+ Allow from all
+
+
**Example After**
.. code-block:: none
- ServerName openstack.example.com
-
- RewriteEngine On
- RewriteCond %{HTTPS} off
- RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
-
-
- RedirectPermanent / https://openstack.example.com
-
+ ServerName openstack.example.com
+
+ RewriteEngine On
+ RewriteCond %{HTTPS} off
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+
+
+ RedirectPermanent / https://openstack.example.com
+
+
- ServerName openstack.example.com
+ ServerName openstack.example.com
- SSLEngine On
- # Remember to replace certificates and keys with valid paths in your environment
- SSLCertificateFile /etc/apache2/SSL/openstack.example.com.crt
- SSLCACertificateFile /etc/apache2/SSL/openstack.example.com.crt
- SSLCertificateKeyFile /etc/apache2/SSL/openstack.example.com.key
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+ SSLEngine On
+ # Remember to replace certificates and keys with valid paths in your environment
+ SSLCertificateFile /etc/apache2/SSL/openstack.example.com.crt
+ SSLCACertificateFile /etc/apache2/SSL/openstack.example.com.crt
+ SSLCertificateKeyFile /etc/apache2/SSL/openstack.example.com.key
+ SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
- # HTTP Strict Transport Security (HSTS) enforces that all communications
- # with a server go over SSL. This mitigates the threat from attacks such
- # as SSL-Strip which replaces links on the wire, stripping away https prefixes
- # and potentially allowing an attacker to view confidential information on the
- # wire
- Header add Strict-Transport-Security "max-age=15768000"
+ # HTTP Strict Transport Security (HSTS) enforces that all communications
+ # with a server go over SSL. This mitigates the threat from attacks such
+ # as SSL-Strip which replaces links on the wire, stripping away https prefixes
+ # and potentially allowing an attacker to view confidential information on the
+ # wire
+ Header add Strict-Transport-Security "max-age=15768000"
- WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi.py
- WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10
- Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
-
- # For Apache http server 2.2 and earlier:
+ WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi.py
+ WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10
+ Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
+
+ Options None
+ AllowOverride None
+ # For Apache http server 2.4 and later:
+ =2.4>
+ Require all granted
+
+ # For Apache http server 2.2 and earlier:
- Order allow,deny
- Allow from all
+ Order allow,deny
+ Allow from all
- # For Apache http server 2.4 and later:
- =2.4>
- #The following two lines have been added by bms for error "AH01630: client denied
- #by server configuration:
- #/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/cssa"
- Options All
- AllowOverride All
- Require all granted
-
-
-
- =2.4>
- Options All
- AllowOverride All
- Require all granted
-
-
+
In this configuration, the Apache HTTP Server listens on port 443 and