[Freeipa-devel] [PATCH] 0016 Tune directory server

[Adam Young]

On 11/17/2010 04:26 PM, Simo Sorce wrote:
> On Tue, 16 Nov 2010 14:09:58 -0500
> Simo Sorce<ssorce at redhat.com>  wrote:
>
>    
>> This patch bumps up the default number of files allowed by default for
>> directory server. This allows more clients and also reserves a bigger
>> number of FDs (at least according to doc) for replication agreements
>> and such things.
>>
>> Ticket 464.
>>      
> Changed the patch to restore files on uninstall. Now 0016-2 depends on
> 0017 attached here too.
>
>
> Simo.
>
>    
>
>
> _______________________________________________
> Freeipa-devel mailing list
> Freeipa-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/freeipa-devel
Patched 17 failed to apply.  Ran using git am as well as patch -p1


Here's the rej



--- ipaserver/install/dsinstance.py
+++ ipaserver/install/dsinstance.py
@@ -185,6 +186,12 @@
          else:
              self.suffix = None

+        if fstore:
+            self.fstore = fstore
+        else:
+            self.fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore')
+
+
      def create_instance(self, ds_user, realm_name, fqdn, domain_name,
                          dm_password, pkcs12_info=None, 
self_signed_ca=False,
                          idstart=1100, idmax=999999, subject_base=None,




Tried patch 16-2 and it failed, too.  Here's the rej

--- ipaserver/install/dsinstance.py
+++ ipaserver/install/dsinstance.py
@@ -185,10 +185,7 @@
          else:
              self.suffix = None

-        if fstore:
-            self.fstore = fstore
-        else:
-            self.fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore')
+        self.fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore')


      def create_instance(self, ds_user, realm_name, fqdn, domain_name,
@@ -533,6 +531,7 @@
              self.stop()

          try:
+            self.fstore.restore_file("/etc/security/limits.conf")
              self.fstore.restore_file("/etc/sysconfig/dirsrv")
          except ValueError, error:
              logging.debug(error)







-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20101118/b00edd87/attachment.htm>