Changeset 11238

Timestamp:

08/19/08 15:07:43 (5 months ago)

Author:

/C=ES/O=Warp Networks S.L./CN=ejhernandez@…

Message:

Added includes parameter to Apache configuration refs #1103

Location:

branches/remote-services/ebox

Files:

• src/EBox/Apache.pm (modified) (1 diff)
• stubs/apache.mas.in (modified) (3 diffs)

branches/remote-services/ebox/src/EBox/Apache.pm

@@ -175 +175 @@
         push @confFileParams, ( tmpdir => EBox::Config::tmp());
         push @confFileParams, ( restrictedResources => $self->_restrictedResources() );
+        push @confFileParams, ( includes => $self->_includes() );
 
         my $debugMode =  EBox::Config::configkey('debug') eq 'yes';

branches/remote-services/ebox/stubs/apache.mas.in

@@ -18 +18 @@
                 - name - String the resource name
                 - type - String the resource type. Options: file, directory or location.
+   includes - Array containing those file includes we want to add
+              this Apache configuration
 </%doc>
 <%args>
@@ -27 +29 @@
         $debug => 'no'
         @restrictedResources => ()
+        @includes => ()
 </%args>
 
@@ -141 +144 @@
 % }
 
+% foreach my $includeFile (@includes) {
+Include <% $includeFile %>
+% }
 
 UseCanonicalName Off