--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openstack/horizon/files/openstack-dashboard-http.conf	Tue Mar 18 09:18:42 2014 -0600
@@ -0,0 +1,23 @@
+<IfDefine 64bit>
+    LoadModule wsgi_module libexec/64/mod_wsgi-2.6.so
+</IfDefine>
+<IfDefine !64bit>
+    LoadModule wsgi_module libexec/mod_wsgi-2.6.so
+</IfDefine>
+
+WSGIScriptAlias /horizon \
+    /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi/django.wsgi
+WSGIDaemonProcess horizon user=webservd group=webservd processes=3 \
+    threads=10
+
+Alias /static /var/lib/openstack_dashboard/static/
+
+<Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi>
+    Order allow,deny
+    Allow from all
+</Directory>
+
+<Directory /var/lib/openstack_dashboard/static>
+    Order allow,deny
+    Allow from all
+</Directory>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openstack/horizon/files/openstack-dashboard-tls.conf	Tue Mar 18 09:18:42 2014 -0600
@@ -0,0 +1,49 @@
+<IfDefine 64bit>
+    LoadModule wsgi_module libexec/64/mod_wsgi-2.6.so
+</IfDefine>
+<IfDefine !64bit>
+    LoadModule wsgi_module libexec/mod_wsgi-2.6.so
+</IfDefine>
+
+#
+# Enable Solaris Cryptographic Framework
+#
+SSLCryptoDevice pkcs11
+
+<VirtualHost *:80>
+    RedirectPermanent /horizon https://openstack.example.com/horizon
+</VirtualHost>
+
+Listen 443
+
+<VirtualHost *:443>
+    ServerName openstack.example.com
+
+    SSLEngine On
+    #
+    # For an overview on SSL with Apache see:
+    #    http://httpd.apache.org/docs/2.2/ssl/ssl_howto.html
+    # For examples on how to configure certificates and keys see:
+    #    http://www.akadia.com/services/ssh_test_certificate.html
+    #
+    SSLCertificateFile /path/to/Server_PEM-encoded_X.509_Certificate_file
+    SSLCACertificateFile /path/to/Concatenated_PEM-encoded_CA_Certificates
+    SSLCertificateKeyFile /path/to/Server_PEM-encoded_Private_Key_file
+
+    WSGIScriptAlias /horizon \
+        /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi/django.wsgi
+    WSGIDaemonProcess horizon user=webservd group=webservd processes=3 \
+        threads=10
+
+    Alias /static /var/lib/openstack_dashboard/static/
+
+    <Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi>
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+    <Directory /var/lib/openstack_dashboard/static>
+        Order allow,deny
+        Allow from all
+    </Directory>
+</VirtualHost>

--- a/components/openstack/horizon/files/openstack-dashboard.conf	Tue Mar 18 03:05:03 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<IfDefine 64bit>
-    LoadModule wsgi_module libexec/64/mod_wsgi-2.6.so
-</IfDefine>
-<IfDefine !64bit>
-    LoadModule wsgi_module libexec/mod_wsgi-2.6.so
-</IfDefine>
-
-#
-# Enable Solaris Cryptographic Framework
-#
-SSLCryptoDevice pkcs11
-
-#<VirtualHost *:80>
-#    RedirectPermanent /horizon https://openstack.example.com/horizon
-#</VirtualHost>
-
-Listen 443
-
-<VirtualHost *:443>
-    #ServerName openstack.example.com
-
-    SSLEngine On
-    #
-    # For an overview on SSL with Apache see:
-    #    http://httpd.apache.org/docs/2.2/ssl/ssl_howto.html
-    # For examples on how to configure certificates and keys see:
-    #    http://www.akadia.com/services/ssh_test_certificate.html
-    #
-    #SSLCertificateFile /path/to/Server_PEM-encoded_X.509_Certificate_file
-    #SSLCACertificateFile /path/to/Concatenated_PEM-encoded_CA_Certificates
-    #SSLCertificateKeyFile /path/to/Server_PEM-encoded_Private_Key_file
-
-    WSGIScriptAlias /horizon \
-        /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess horizon user=webservd group=webservd processes=3 \
-        threads=10
-
-    Alias /static /var/lib/openstack_dashboard/static/
-
-    <Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi>
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    <Directory /var/lib/openstack_dashboard/static>
-        Order allow,deny
-        Allow from all
-    </Directory>
-</VirtualHost>

--- a/components/openstack/horizon/horizon.p5m	Tue Mar 18 03:05:03 2014 -0700
+++ b/components/openstack/horizon/horizon.p5m	Tue Mar 18 09:18:42 2014 -0600
@@ -56,9 +56,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/058
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file files/openstack-dashboard.conf \
-    path=etc/apache2/2.2/conf.d/openstack-dashboard.conf \
-    refresh_fmri=svc:/network/http:apache22
+file files/openstack-dashboard-http.conf \
+    path=etc/apache2/2.2/samples-conf.d/openstack-dashboard-http.conf
+file files/openstack-dashboard-tls.conf \
+    path=etc/apache2/2.2/samples-conf.d/openstack-dashboard-tls.conf
 file files/local_settings.py path=etc/openstack_dashboard/local_settings.py \
     mode=0644 overlay=allow pkg.tmp.autopyc=false preserve=true
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
@@ -766,12 +767,12 @@
     target=../../../../../usr/lib/python$(PYVER)/vendor-packages/horizon/static/horizon
 license horizon.license license="Apache v2.0" \
     com.oracle.info.description="Horizon, the OpenStack web based user interface service" \
-    com.oracle.info.name=$(COMPONENT_NAME) \
-    com.oracle.info.tpno=16292 com.oracle.info.version=$(IPS_COMPONENT_VERSION)
+    com.oracle.info.name=$(COMPONENT_NAME) com.oracle.info.tpno=16292 \
+    com.oracle.info.version=$(IPS_COMPONENT_VERSION)
 license solaris.css.license license="Apache v2.0 (Solaris theme)" \
     com.oracle.info.description="the Solaris theme for the OpenStack Dashboard" \
-    com.oracle.info.name=$(COMPONENT_NAME) \
-    com.oracle.info.tpno=16775 com.oracle.info.version=1.0
+    com.oracle.info.name=$(COMPONENT_NAME) com.oracle.info.tpno=16775 \
+    com.oracle.info.version=1.0
 
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \