Browse Source

added the changes of the last working version

pull/1/head
Holger Frey 4 years ago
parent
commit
74f9a490fc
  1. 18
      manage.py

18
manage.py

@ -12,7 +12,7 @@ import sys
from datetime import datetime from datetime import datetime
# defining some constants # defining some constants
MOUNT_PATH = os.path.join("/mnt", "sshfs-for-svn") MOUNT_PATH = os.path.join("/mnt", "nfs-data-store-1", "drive")
REPO_PATH = os.path.join(MOUNT_PATH, "svn-repository") REPO_PATH = os.path.join(MOUNT_PATH, "svn-repository")
AUTHZ_PATH = os.path.join(REPO_PATH, "authz") AUTHZ_PATH = os.path.join(REPO_PATH, "authz")
HTPWD_PATH = os.path.join(REPO_PATH, ".htpasswd") HTPWD_PATH = os.path.join(REPO_PATH, ".htpasswd")
@ -142,8 +142,8 @@ class AuthzConfigParser(ConfigParser.ConfigParser, object):
for section in sorting: for section in sorting:
fp.write("[%s]\n" % section) fp.write("[%s]\n" % section)
acls = dict( (k, v) for k, v in self._sections[section].items() if k != "__name__") acls = dict( (k, v) for k, v in self._sections[section].items() if k != "__name__")
if section != "groups": if section != "groups":
for group in (ADMINS, USERS, RESTRICTED, ALUMNI): for group in (ADMINS, USERS, RESTRICTED, ALUMNI):
group_id = "@" + group group_id = "@" + group
acl_value = acls.pop(group_id, GROUP_DEFAULTS[group]) acl_value = acls.pop(group_id, GROUP_DEFAULTS[group])
key = " = ".join((group_id, str(acl_value).replace('\n', '\n\t'))) key = " = ".join((group_id, str(acl_value).replace('\n', '\n\t')))
@ -286,14 +286,16 @@ if __name__ == "__main__":
if options.what in ("a", "r"): if options.what in ("a", "r"):
# add a user, restricted or regular # add a user, restricted or regular
if name in config.elab_users: if name in config.elab_users:
sys.exit("Username '%s' already in use" % username) sys.exit("Username '%s' already in use" % name)
group = RESTRICTED if options.what == "r" else USERS group = RESTRICTED if options.what == "r" else USERS
config.add_journal_acl_for(name, group) config.add_journal_acl_for(name, group)
create_new_repository(name) create_new_repository(name)
#subprocess.check_call(SVN_DIR_CREATOR + " " + name, shell=True) #subprocess.check_call(SVN_DIR_CREATOR + " " + name, shell=True)
password = set_new_password(name) password = set_new_password(name)
print "New password for user '%s': '%s'" % (name, password) print "New password for :"
print "http://svn.cpi.imtek.uni-freiburg.de/" + name print "username: " + name
print "password: " + password
print "url: https://svn.cpi.imtek.uni-freiburg.de/" + name
config.write_to_file() config.write_to_file()
sys.exit() sys.exit()
@ -316,7 +318,9 @@ if __name__ == "__main__":
if options.what == "p": if options.what == "p":
# reset a password # reset a password
password = set_new_password(name) password = set_new_password(name)
print "New password for user '%s': '%s'" % (name, password) print "New password for :"
print "username: " + name
print "password: " + password
sys.exit() sys.exit()
# no option, just a name: # no option, just a name:

Loading…
Cancel
Save