Index: noc/nagios/private/resource-dist.cfg
===================================================================
--- noc/nagios/private/resource-dist.cfg	(revision 320)
+++ noc/nagios/private/resource-dist.cfg	(revision 320)
@@ -0,0 +1,9 @@
+# Sets $USER1$ to be the path to the plugins
+$USER1$=/usr/lib/nagios/plugins
+
+# Sets $USER2$ to be the path to event handlers
+#$USER2$=/usr/lib/nagios/plugins/eventhandlers
+
+# Store some usernames and passwords (hidden from the CGIs)
+$USER3$=%MYSQL_USERNAME%
+$USER4$=%MYSQL_PASSWORD%
Index: noc/nagios/private/resource.cfg
===================================================================
--- noc/nagios/private/resource.cfg	(revision 319)
+++ 	(revision )
@@ -1,9 +1,0 @@
-# Sets $USER1$ to be the path to the plugins
-$USER1$=/usr/lib/nagios/plugins
-
-# Sets $USER2$ to be the path to event handlers
-#$USER2$=/usr/lib/nagios/plugins/eventhandlers
-
-# Store some usernames and passwords (hidden from the CGIs)
-$USER3$=%MYSQL_USERNAME%
-$USER4$=%MYSQL_PASSWORD%