17 files changed, 27 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index b831591..30029a5 100755
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ clean:
 #	python tests/tests.py
 #	-rm -rf /tmp/_cobbler-*
 
-messages: server/*.py
-	xgettext -k_ -kN_ -o $(MESSAGESPOT) server/*.py 
+messages: minion/*.py
+	xgettext -k_ -kN_ -o $(MESSAGESPOT) minion/*.py 
 	sed -i'~' -e 's/SOME DESCRIPTIVE TITLE/func/g' -e 's/YEAR THE PACKAGE'"'"'S COPYRIGHT HOLDER/2007 Red Hat, inc. /g' -e 's/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR/Adrian Likins <alikins@redhat.com>, 2007/g' -e 's/PACKAGE VERSION/func $(VERSION)-$(RELEASE)/g' -e 's/PACKAGE/func/g' $(MESSAGESPOT)
 
 
diff --git a/func.spec b/func.spec
index 71c2dcf..004f527 100644
--- a/func.spec
+++ b/func.spec
@@ -38,13 +38,13 @@ rm -fr $RPM_BUILD_ROOT
 /etc/init.d/funcd
 %config(noreplace) /etc/func/settings
 %dir %{python_sitelib}/func
-%dir %{python_sitelib}/func/server
-%dir %{python_sitelib}/func/client
-%{python_sitelib}/func/server/*.py*
-%{python_sitelib}/func/client/*.py*
+%dir %{python_sitelib}/func/minion
+%dir %{python_sitelib}/func/overlord
+%{python_sitelib}/func/minion/*.py*
+%{python_sitelib}/func/overlord/*.py*
 
-%dir %{python_sitelib}/func/server/modules
-%{python_sitelib}/func/server/modules/*.py*
+%dir %{python_sitelib}/func/minion/modules
+%{python_sitelib}/func/minion/modules/*.py*
 %dir /var/log/func
 
 %post
@@ -59,6 +59,9 @@ fi
 
 
 %changelog
+* Tue Sep 25 2007 Robin Norwood <rnorwood@redhat.com> - 0.0.11-3
+- Change server -> minion and client -> overlord
+
 * Thu Sep 20 2007 James Bowes <jbowes@redhat.com> - 0.0.11-2
 - Clean up some speclint warnings
 
diff --git a/client/__init__.py b/minion/__init__.py
index e69de29..e69de29 100644
--- a/client/__init__.py
+++ b/minion/__init__.py
diff --git a/server/codes.py b/minion/codes.py
index dc0ceac..dc0ceac 100755
--- a/server/codes.py
+++ b/minion/codes.py
diff --git a/server/config_data.py b/minion/config_data.py
index 7ace8ca..4980cc7 100755
--- a/server/config_data.py
+++ b/minion/config_data.py
@@ -41,9 +41,9 @@ class Config:
 
         cp.read([CONFIG_FILE])
         
-        self.ds["is_master"] = int(cp.get("general","is_master"))
+        self.ds["is_overlord"] = int(cp.get("general","is_overlord"))
         self.ds["is_minion"] = int(cp.get("general","is_minion"))
-        self.ds["master_server"] = cp.get("general","master_server")
+        self.ds["overlord_server"] = cp.get("general","overlord_server")
 
     def get(self):
         return self.ds
diff --git a/server/logger.py b/minion/logger.py
index 1e60dc0..1e60dc0 100755
--- a/server/logger.py
+++ b/minion/logger.py
diff --git a/server/module_loader.py b/minion/module_loader.py
index 137625c..4d7c816 100755
--- a/server/module_loader.py
+++ b/minion/module_loader.py
@@ -40,8 +40,8 @@ def module_walker(topdir):
 
 def load_modules(blacklist=None):
 
-    module_file_path="%s/func/server/modules/" % distutils.sysconfig.get_python_lib()
-    mod_path="%s/func/server/"  % distutils.sysconfig.get_python_lib()
+    module_file_path="%s/func/minion/modules/" % distutils.sysconfig.get_python_lib()
+    mod_path="%s/func/minion/"  % distutils.sysconfig.get_python_lib()
 
     sys.path.insert(0, mod_path)
     mods = {}
@@ -90,7 +90,7 @@ def load_modules(blacklist=None):
 
 if __name__ == "__main__":
 
-    module_file_path = "/usr/lib/python2.5/site-packages/func/server/modules/"
+    module_file_path = "/usr/lib/python2.5/site-packages/func/minion/modules/"
     bar = module_walker(module_file_path)
     print bar
     for f in bar:
diff --git a/server/server.py b/minion/server.py
index 73ef114..73ef114 100755
--- a/server/server.py
+++ b/minion/server.py
diff --git a/server/sub_process.py b/minion/sub_process.py
index 7c229dc..7c229dc 100644
--- a/server/sub_process.py
+++ b/minion/sub_process.py
diff --git a/server/utils.py b/minion/utils.py
index 724c847..724c847 100755
--- a/server/utils.py
+++ b/minion/utils.py
diff --git a/server/__init__.py b/overlord/__init__.py
index e69de29..e69de29 100644
--- a/server/__init__.py
+++ b/overlord/__init__.py
diff --git a/client/dumb_client.py b/overlord/dumb_client.py
index c6a31ed..c6a31ed 100755
--- a/client/dumb_client.py
+++ b/overlord/dumb_client.py
diff --git a/client/test_func.py b/overlord/test_func.py
index bcce45d..bcce45d 100644
--- a/client/test_func.py
+++ b/overlord/test_func.py
diff --git a/scripts/funcd b/scripts/funcd
index 165dd68..2301acf 100755
--- a/scripts/funcd
+++ b/scripts/funcd
@@ -6,7 +6,7 @@ import distutils.sysconfig
 
 sys.path.append("%s/func" % distutils.sysconfig.get_python_lib())
 
-from server import server
+from minion import server
 
 if __name__ == "__main__":
     server.main(sys.argv)
diff --git a/settings b/settings
index 8344dee..8177535 100644
--- a/settings
+++ b/settings
@@ -1,7 +1,7 @@
-# configuration for master servers
+# configuration for overlord servers
 
 [general]
-is_master = 0
+is_overlord = 0
 is_minion = 1
-master_server = funcmaster
+overlord_server = funcmaster
 log_level = DEBUG
diff --git a/setup.py b/setup.py
index b91f1c6..2049a44 100644
--- a/setup.py
+++ b/setup.py
@@ -43,14 +43,14 @@ if __name__ == "__main__":
                 ],
 		# package_data = { '' : ['*.*'] },
                 package_dir = {"%s" % NAME: "",
-			       "%s/server" % NAME: "server",
-			       "%s/server/modules" % NAME: "modules/",
-			       "%s/client" % NAME: "client"
+			       "%s/minion" % NAME: "minion/",
+			       "%s/minion/modules" % NAME: "modules/",
+			       "%s/overlord" % NAME: "overlord/"
                 },
 		packages = ["%s" % NAME,
-	        	    "%s/server" % NAME,
-			    "%s/client" % NAME,
-	        	    "%s/server/modules" % NAME
+	        	    "%s/minion" % NAME,
+			    "%s/overlord" % NAME,
+	        	    "%s/minion/modules" % NAME
                 ],
                 data_files = [(initpath, ["init-scripts/funcd"]),
                               (etcpath, ["settings",]),
diff --git a/version b/version
index 2311023..01c3668 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.11 2
+0.11 3