From ca4321600af69d3069c721aea4578ba2f9a4a5ef Mon Sep 17 00:00:00 2001 From: Ricky Zhou Date: Jun 27 2008 00:07:16 +0000 Subject: Put the FAS URL into supybot config. --- diff --git a/config.py b/config.py index 66c67f8..1b12d6a 100644 --- a/config.py +++ b/config.py @@ -44,6 +44,8 @@ Fedora = conf.registerPlugin('Fedora') # conf.registerGlobalValue(Fedora, 'someConfigVariableName', # registry.Boolean(False, """Help for someConfigVariableName.""")) conf.registerGroup(Fedora, 'fas') +conf.registerGlobalValue(Fedora.fas, 'url', + registry.String('', """URL for the Fedora Account System""")) conf.registerGlobalValue(Fedora.fas, 'username', registry.String('', """Username for the Fedora Account System""", private=True)) conf.registerGlobalValue(Fedora.fas, 'password', diff --git a/plugin.py b/plugin.py index f3b483f..bdf6299 100644 --- a/plugin.py +++ b/plugin.py @@ -101,15 +101,16 @@ class Fedora(callbacks.Plugin): # To get the information, we need a username and password to FAS. # DO NOT COMMIT YOUR USERNAME AND PASSWORD TO THE PUBLIC REPOSITORY! + self.fasurl = self.registryValue('fas.url') self.username = self.registryValue('fas.username') self.password = self.registryValue('fas.password') + self.fasclient = AccountSystem(self.fasurl, self.username, self.password) # URLs self.url = {} self.url["groupdump"] = 'https://admin.fedoraproject.org/accounts/group/dump/' self.url["owners"] = "https://admin.fedoraproject.org/pkgdb/acls/bugzilla?tg_format=plain" - self.fasclient = AccountSystem('https://admin.fedoraproject.org/accounts/', self.username, self.password) def _getowners(self):