7165810 wrong dependences in visual-panels/panel-apache package
authorPetr Sumbera <petr.sumbera@oracle.com>
Mon, 13 Aug 2012 00:20:29 -0700
changeset 942 d65e8c2f0593
parent 941 273507668ba5
child 943 8f25c7c6a9a4
child 2325 d300ed6619a8
7165810 wrong dependences in visual-panels/panel-apache package 7189358 visual-panels/panel-apache package should not depend on apache-php5 7189367 /etc/vpanels/httpd_conf.templ includes non existing file php5.2.conf
components/visual-panels/apache/src/cmd/httpd/httpd_conf.templ
components/visual-panels/apache/system-management-visual-panels-panel-apache.p5m
--- a/components/visual-panels/apache/src/cmd/httpd/httpd_conf.templ	Thu Aug 09 13:59:16 2012 -0700
+++ b/components/visual-panels/apache/src/cmd/httpd/httpd_conf.templ	Mon Aug 13 00:20:29 2012 -0700
@@ -39,11 +39,9 @@
 #
 <IfDefine 64bit>
 Include /etc/apache2/2.2/conf.d/modules-64.load
-LoadModule perl_module libexec/amd64/mod_perl.so
 </IfDefine>
 <IfDefine !64bit>
 Include /etc/apache2/2.2/conf.d/modules-32.load
-LoadModule perl_module libexec/mod_perl.so
 </IfDefine>
 
 
@@ -268,10 +266,13 @@
     # (You will also need to add "ExecCGI" to the "Options" directive.)
     #
     AddHandler cgi-script .cgi
+
+<IfModule mod_perl.c>
     AddHandler perl-script .pl
 
     PerlResponseHandler ModPerl::Registry
     PerlOptions +ParseHeaders
+</IfModule>
 
     # For type maps (negotiated resources):
     #AddHandler type-map var
@@ -317,12 +318,22 @@
 
 # Supplemental configuration
 #
-# The configuration files in the /etc/apache2/2.2/conf.d/ directory can be 
-# included to add extra features or to modify the default configuration of 
-# the server, or you may simply copy their contents here and change as 
+# Include all the .conf configuration files in the 
+# /etc/apache2/2.2/conf.d/ directory.
+#
+# You can place additional configuration files in the
+# /etc/apache2/2.2/conf.d/ directory to add extra features
+# or to modify the default configuration of the server,
+# or you may simply copy their contents here and change as 
 # necessary.
+#
+# Sample configuration files are in the
+# /etc/apache2/2.2/samples-conf.d directory. To use a 
+# sample .conf file, copy it to  /etc/apache2/2.2/conf.d 
+# directory and modify as required.
+#
+Include /etc/apache2/2.2/conf.d/*.conf
 
-Include /etc/apache2/2.2/conf.d/php5.2.conf
 #
 # Visual Panels will supply SSL configuration(s) 
 # Include /etc/apache2/2.2/conf.d/ssl.conf
--- a/components/visual-panels/apache/system-management-visual-panels-panel-apache.p5m	Thu Aug 09 13:59:16 2012 -0700
+++ b/components/visual-panels/apache/system-management-visual-panels-panel-apache.p5m	Mon Aug 13 00:20:29 2012 -0700
@@ -34,7 +34,6 @@
 depend fmri=pkg:/system/management/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) type=require
 depend fmri=pkg:/system/management/visual-panels/panel-apache/locale type=require
 depend fmri=pkg:/web/server/apache-22 type=require
-depend fmri=pkg:/web/server/apache-22/module/apache-php5 type=require
 
 dir path=etc
 dir path=etc/vpanels group=sys