Initial stab at issue/1

README.md

@@ -64,6 +64,12 @@ Type documentation can be generated with `puppet doc -r type` or viewed on the
 
 ### apache_directive provider
 
+#### Composite namevars
+This type supports composite namevars in order to easily specify the entry you want to manage.  The format is:
+    <directive> of <context>
+or
+    <directive> of <context> in <target>
+
 #### manage simple entry
 
     apache_directive { "StartServers":
@@ -89,6 +95,7 @@ Type documentation can be generated with `puppet doc -r type` or viewed on the
 
 The `SetEnv` directive is not unique per scope: the first arg identifies the entry we want to update, and needs to be taken into account. For this reason, we set `args_params` to `1`.
 
+
 #### set a value in a given context
 
     apache_directive { 'StartServers for mpm_prefork_module':
@@ -103,6 +110,17 @@ The directive is nested in the context of the `mpm_prefork_module` module, so we
 
 The value of `StartServers` for the `mpm_prefork_module` module will be set/updated to `4`. Note that the `IfModule` entry will not be created if it is missing.
 
+#### manage entry with composite namevars
+    apache_directive { 'Options of Directory[arg=\'"/var/www/html"\']':
+      ensure      => present,
+      args        => ['FollowSymLinks', ],
+    }
+
+    apache_directive { 'Options of Directory[arg=\'"/var/www/icons"\']':
+      ensure      => present,
+      args        => ['MultiViews', 'FollowSymLinks', ],
+    }
+
 
 ### apache_setenv provider
 

lib/puppet/provider/apache_directive/augeas.rb

@@ -21,10 +21,10 @@
     path = '$target'
     path += "/#{resource[:context]}" unless resource[:context].empty?
     if supported?(:regexpi)
-      path += "/directive[.=~regexp('#{resource[:name]}', 'i')"
+      path += "/directive[.=~regexp('#{resource[:directive]}', 'i')"
     else
       debug "Warning: Augeas >= 1.0.0 is required for case-insensitive support in apache_directive resources"
-      path += "/directive[.='#{resource[:name]}'"
+      path += "/directive[.='#{resource[:directive]}'"
     end
     if resource[:args]
       resource[:args][0, resource[:args_params].to_i].each_with_index do |a, i|
@@ -60,7 +60,7 @@ def create
     augopen! do |aug|
       top_path = '$target'
       top_path += "/#{resource[:context]}" unless resource[:context].empty?
-      last_path = "#{top_path}/directive[.='#{resource[:name]}'][last()]"
+      last_path = "#{top_path}/directive[.='#{resource[:directive]}'][last()]"
       if aug.match(last_path).empty?
         aug.clear("#{top_path}/directive[last()+1]") 
       else
@@ -70,7 +70,7 @@ def create
 
       # The new node is the only directive without a value
       aug.defvar('new', "#{top_path}/directive[.='']")
-      aug.set('$new', resource[:name])
+      aug.set('$new', resource[:directive])
       resource[:args].each_with_index do |a,i|
         aug.set("$new/arg[#{i+1}]", a)
       end

lib/puppet/type/apache_directive.rb

@@ -31,6 +31,11 @@ def insync?(is)
     isnamevar
   end
 
+  newparam(:directive) do
+    desc 'The apache directive to modify'
+    defaultto self[:name]
+  end
+
   newparam(:context) do
     desc 'The path where the directive is located. Expressed as an Augeas path expression.'
     defaultto ''
@@ -50,6 +55,41 @@ def insync?(is)
   end
 
   newparam(:target) do
-    desc 'The config file to use'
+    desc 'The config file to modify'
+  end
+
+  def self.title_patterns
+    identity = lambda { |x| x }
+    [
+      [
+        /^((\w+)\s+of\s+(.+)\s+in\s+(.*))$/,
+        [
+          [ :name, identity ],
+          [ :directive, identity ],
+          [ :context, identity ],
+          [ :target, identity ],
+        ]
+      ],
+      [
+        /^((\w+)\s+of\s+(.+))$/,
+        [
+          [ :name, identity ],
+          [ :directive, identity ],
+          [ :context, identity ],
+        ]
+      ],
+      [
+        /((.*))/,
+        [
+          [ :name, identity ],
+          [ :directive, identity ],
+        ]
+      ]
+    ]
   end
+
+  autorequire(:file) do
+    self[:target]
+  end
+
 end

spec/fixtures/unit/puppet/provider/apache_directive/augeas/full

@@ -230,6 +230,19 @@ LogFormat "%{User-agent}i" agent
 # Include of directories ignores editors' and dpkg's backup files,
 # see README.Debian for details.
 
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+
 # Include generic snippets of statements
 Include conf.d/
 

spec/unit/puppet/provider/apache_directive/augeas_spec.rb

@@ -45,7 +45,7 @@
         }
       }
 
-      inst.size.should == 49
+      inst.size.should == 51
       inst[0].should == {:args=>["${APACHE_LOCK_DIR}/accept.lock"], :name=>"LockFile", :ensure=>:present, :context=>""}
       inst[5].should == {:args=>["5"], :name=>"KeepAliveTimeout", :ensure=>:present, :context=>""}
       inst[30].should == {:args=>["150"], :context=>"IfModule[1]", :name=>"MaxClients", :ensure=>:present}
@@ -167,10 +167,24 @@
           aug.get("IfModule[arg='mpm_worker_module']/directive[.='StartServers']/arg").should == '2'
         end
       end
+
+      it "updating should update value" do
+        apply!(Puppet::Type.type(:apache_directive).new(
+          :name        => 'Options of Directory[arg="/"]',
+          :args_params => 0,
+          :args        => ['FollowSymLinks', 'Indexes'],
+          :ensure      => "present",
+          :target      => target,
+          :provider    => "augeas"
+        ))
+
+        aug_open(target, "Httpd.lns") do |aug|
+          aug.get('Directory[arg="/"]/directive[1]/arg').should == ['FollowSymLinks', 'Indexes']
+        end
+      end
     end
   end
 
-
   context "with broken file" do
     let(:tmptarget) { aug_fixture("broken") }
     let(:target) { tmptarget.path }