[DRBD-cvs] svn commit by phil - r3076 - branches/drbd-8.2/scripts - Restored the example drbd.conf to what it should be.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-09-28 11:20:58 +0200 (Fri, 28 Sep 2007)
New Revision: 3076

Modified:
   branches/drbd-8.2/scripts/drbd.conf
Log:
Restored the example drbd.conf to what it should be.


Modified: branches/drbd-8.2/scripts/drbd.conf
===================================================================
--- branches/drbd-8.2/scripts/drbd.conf	2007-09-28 09:13:15 UTC (rev 3075)
+++ branches/drbd-8.2/scripts/drbd.conf	2007-09-28 09:20:58 UTC (rev 3076)
@@ -367,7 +367,7 @@
     # To achieve better resynchronisation performance you should resync
     # DRBD resources which have their backing storage on one physical
     # disk sequentially. The express this use the "after" keyword.
-    #after "r2";
+    after "r2";
 
     # Configures the size of the active set. Each extent is 4M,
     # 257 Extents ~> 1GB active set size. In case your syncer
@@ -378,19 +378,11 @@
     al-extents 257;
   }
 
-  proxy {
-    memlimit 20M;
-  }
-
   on amd {
     device     /dev/drbd0;
     disk       /dev/hde5;
     address    192.168.22.11:7788;
     flexible-meta-disk  internal;
-    proxy on mescal {
-      inside 127.0.0.1:1234;
-      outside 127.0.0.1:1235;
-    }
 
     # meta-disk is either 'internal' or '/dev/ice/name [idx]'
     #
@@ -410,9 +402,82 @@
     disk      /dev/hdc5;
     address   192.168.22.12:7788;
     meta-disk internal;
-    proxy on alf {
-      inside 127.0.0.1:2234;
-      outside 127.0.0.1:2235;
-    }
   }
 }
+
+#
+# yes, you may also quote the resource name.
+# but don't include whitespace, unless you mean it :)
+#
+resource "r1" {
+  protocol C;
+  startup {
+    wfc-timeout         0;  ## Infinite!
+    degr-wfc-timeout  120;  ## 2 minutes.
+  }
+  disk {
+    on-io-error detach;
+  }
+  net {
+    # timeout           60;
+    # connect-int       10;
+    # ping-int          10;
+    # max-buffers     2048;
+    # max-epoch-size  2048;
+  }
+  syncer {
+  }
+
+  on amd {
+    device	/dev/drbd1;
+    disk	/dev/hde6;
+    address	192.168.22.11:7789;
+    meta-disk	/dev/somewhere [7];
+  }
+
+  on alf {
+    device     /dev/drbd1;
+    disk       /dev/hdc6;
+    address    192.168.22.12:7789;
+    meta-disk  /dev/somewhere [7];
+  }
+}
+
+resource r2 {
+  protocol C;
+
+  startup { wfc-timeout 0; degr-wfc-timeout 120; }
+  disk    { on-io-error detach; }
+  net     { timeout 60; connect-int 10; ping-int 10;
+            max-buffers 2048; max-epoch-size 2048; }
+  syncer  { rate 4M; } # sync when r0 and r1 are finished syncing.
+  on amd {
+    address 192.168.22.11:7790;
+    disk /dev/hde7; device /dev/drbd2; meta-disk "internal";
+  }
+  on alf {
+    device "/dev/drbd2"; disk "/dev/hdc7"; meta-disk "internal";
+    address 192.168.22.12:7790;
+  }
+}
+
+resource r3 {
+  protocol	C;
+
+  startup { wfc-timeout	0; degr-wfc-timeout	120; }
+  disk { on-io-error detach; }
+  syncer {
+  }
+  on amd {
+    device	/dev/drbd3;
+    disk	/dev/hde8;
+    address	192.168.22.11:7791;
+    meta-disk	internal;
+  }
+  on alf {
+    device	/dev/drbd3;
+    disk	/dev/hdc8;
+    address	192.168.22.12:7791;
+    meta-disk	/some/where[8];
+  }
+}