File limnoria-adduser-suse.patch of Package limnoria

Overview Repositories Revisions Requests Users Attributes Meta

File limnoria-adduser-suse.patch of Package limnoria (Revision f29596a5e3af21a3a944e916d8d57114)

Currently displaying revision f29596a5e3af21a3a944e916d8d57114 , Show latest

--- Limnoria/src/scripts/limnoria_adduser-suse	2023-06-30 23:01:14.997173308 +0200
+++ limnoria_adduser-suse			2023-07-01 00:22:51.968738254 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
 
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
@@ -36,15 +36,14 @@
 
 from supybot.questions import *
 
+import optparse
 import os
+import pwd
 import sys
-import optparse
 
 def main():
-    import supybot.log as log
     import supybot.conf as conf
-    conf.supybot.log.stdout.setValue(False)
-    parser = optparse.OptionParser(usage='Usage: %prog [options] <users.conf>',
+    parser = optparse.OptionParser(usage='Usage: sudo -u limnoria %prog [options] <instance>',
                                    version='supybot %s' % conf.version)
     parser.add_option('-u', '--username', action='store', default='',
                       dest='name',
@@ -57,20 +56,39 @@
                       help='capability the user should have; '
                            'this option may be given multiple times.')
     (options, args) = parser.parse_args()
+    if not pwd.getpwuid(os.getuid()).pw_name == 'limnoria':
+        print('Please run this script using `sudo -u limnoria limnoria_adduser-suse <instance name>`.')
+        sys.exit(1)
     if len(args) != 1:
-        parser.error('Specify the users.conf file you\'d like to use.  '
-                     'Be sure *not* to specify your registry file, generated '
-                     'by supybot-wizard.  This is not the file you want.  '
-                     'Instead, take a look in your conf directory (usually '
-                     'named "conf") and take a gander at the file '
-                     '"users.conf".  That\'s the one you want.')
-
-    filename = os.path.abspath(args[0])
-    conf.supybot.directories.log.setValue('/')
-    conf.supybot.directories.conf.setValue('/')
-    conf.supybot.directories.data.setValue('/')
-    conf.supybot.directories.plugins.setValue(['/'])
+        parser.error('Specify the instance name of the bot you\'d like to add a user for.')
+
+    ### SUSE
+    SUSEINSTANCECONFIG = '/etc/limnoria/.limnoria.configured'
+    SUSECONFDIR = '/etc/limnoria/'
+    SUSELOGDIR = '/var/log/limnoria/'
+    SUSEDATADIR = '/var/lib/limnoria/'
+
+    instance = args[0]
+
+    with open(SUSEINSTANCECONFIG, 'r') as admFile:
+        if not any(instance == instanceEntry.rstrip('\n') for instanceEntry in admFile):
+            print("""Unable to find a bot instance called %s, was it configured using limnoria_wizard-suse?""" % instance)
+            sys.exit(1)
+
+    instanceConfigDir = SUSECONFDIR + instance
+    instanceDataDir = SUSEDATADIR + instance
+    instanceLogDir = SUSELOGDIR + instance
+
+    conf.supybot.directories.log.setValue(instanceLogDir)
+    conf.supybot.directories.data.setValue(instanceDataDir)
+    conf.supybot.directories.conf.setValue(instanceConfigDir)
+
+    import supybot.log as log
+    conf.supybot.log.stdout.setValue(False)
+
+    filename = '/etc/limnoria/' + instance + '/users.conf'
     conf.supybot.databases.users.filename.setValue(filename)
+
     import supybot.ircdb as ircdb
 
     if not options.name:

Places

File limnoria-adduser-suse.patch of Package limnoria (Revision f29596a5e3af21a3a944e916d8d57114)

Places