message building fixes in the Makefile

[certmaster.git] / setup.py

diff --git a/setup.py b/setup.py
index 332ff96..3c85112 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 #from setuptools import setup,find_packages
 
-NAME = "func"
+NAME = "certmaster"
 VERSION = open("version", "r+").read().split()[0]
 SHORT_DESC = "%s remote configuration and management api" % NAME
 LONG_DESC = """
@@ -15,7 +15,6 @@ if __name__ == "__main__":
  
         manpath    = "share/man/man1/"
         etcpath    = "/etc/%s" % NAME
-        etcmodpath = "/etc/%s/modules" % NAME
         initpath   = "/etc/init.d/"
         logpath    = "/var/log/%s/" % NAME
        certdir    = "/var/lib/%s/certmaster" % NAME
@@ -26,14 +25,12 @@ if __name__ == "__main__":
                 name="%s" % NAME,
                 version = VERSION,
                 author = "Lots",
-                author_email = "func-list@redhat.com",
-                url = "https://hosted.fedoraproject.org/projects/func/",
+                author_email = "certmaster-list@redhat.com",
+                url = "https://hosted.fedoraproject.org/projects/certmaster/",
                 license = "GPL",
                scripts = [
-                     "scripts/funcd", "scripts/func", 
                      "scripts/certmaster", "scripts/certmaster-ca",
-                     "scripts/func-inventory",
-                     "scripts/func-create-module",
+                     "scripts/certmaster-request",
                 ],
                # package_data = { '' : ['*.*'] },
                 package_dir = {"%s" % NAME: "%s" % NAME
@@ -41,26 +38,14 @@ if __name__ == "__main__":
                packages = ["%s" % NAME,
                            "%s/minion" % NAME,
                            "%s/overlord" % NAME,
-                           "%s/overlord/cmd_modules" % NAME,
-                            "%s/overlord/modules" % NAME,
-                            "%s/minion/modules" % NAME,
-                            # FIXME if there's a clean/easy way to recursively
-                            # find modules then by all means do it, for now
-                            # this will work.
-                            "%s/minion/modules.netapp" % NAME,
-                            "%s/minion/modules.netapp.vol" % NAME
                 ],
-                data_files = [(initpath, ["init-scripts/funcd"]),
-                              (initpath, ["init-scripts/certmaster"]),
+                data_files = [(initpath, ["init-scripts/certmaster"]),
                               (etcpath,  ["etc/minion.conf"]),
                               (etcpath,  ["etc/certmaster.conf"]),
-                              (etcmodpath, []),
-                              (manpath,  ["docs/func.1.gz"]),
-                              (manpath,  ["docs/func-inventory.1.gz"]),
-                              (manpath,  ["docs/funcd.1.gz"]),
                               (manpath,  ["docs/certmaster.1.gz"]),
+                              (manpath,  ["docs/certmaster-request.1.gz"]),
                               (manpath,  ["docs/certmaster-ca.1.gz"]),
-                             (rotpath,  ['etc/func_rotate']),
+                             (rotpath,  ['etc/certmaster_rotate']),
                               (logpath,  []),
                              (certdir,  []),
                              (etcpath,  []),