From b94480b2a9c9eed893be79cbfedac7369b2bbfe4 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Tue, 20 Jan 2004 17:20:00 +0000 Subject: [PATCH] Se actualiza SAPO para que no use grupos. No se necesita mas sudo para svncreate. --- subversion/sapo/.htaccess | 6 --- subversion/sapo/index.html | 2 +- subversion/sapo/sapo.php | 82 ----------------------------------- subversion/sapo/sapo.py | 47 +++----------------- subversion/sapo/svncreate | 17 -------- subversion/sapo/template.conf | 11 ----- 6 files changed, 8 insertions(+), 157 deletions(-) delete mode 100644 subversion/sapo/.htaccess delete mode 100644 subversion/sapo/sapo.php delete mode 100644 subversion/sapo/template.conf diff --git a/subversion/sapo/.htaccess b/subversion/sapo/.htaccess deleted file mode 100644 index dc7bdf7..0000000 --- a/subversion/sapo/.htaccess +++ /dev/null @@ -1,6 +0,0 @@ -AuthName "Creador de Repositorios Subversion" -AuthType Basic -AuthUserFile /etc/svn/passwd -AuthGroupFile /etc/svn/group -#Require valid-user -Require group desarrolladores diff --git a/subversion/sapo/index.html b/subversion/sapo/index.html index c5e75f3..08c3bf7 100644 --- a/subversion/sapo/index.html +++ b/subversion/sapo/index.html @@ -7,7 +7,7 @@

SAPO

Systema de Administración de Portal y Otros

diff --git a/subversion/sapo/sapo.php b/subversion/sapo/sapo.php deleted file mode 100644 index 97cb0cb..0000000 --- a/subversion/sapo/sapo.php +++ /dev/null @@ -1,82 +0,0 @@ - - - - Creador de Repositorios Subversion - - -

Creador de Repositorios Subversion

-'; - $retval = 0; - echo system( - //echo( - sprintf( - "%s %s %s %s", - $svncreate, - escapeshellarg($_REQUEST['repos']), - escapeshellarg($_REQUEST['desc']), - escapeshellarg(join(' ', $_REQUEST['users'])) - ), - $retval - ); - if ($retval) { - echo "Hubo un error: $retval"; - } - echo "\n"; - $url = sprintf('http://portal.mecon.ar/svn/%s/tronco/', $_REQUEST['repos']); - printf('Puede hacer un checkout con: svn co %s %s.%s', $url, $url, $_REQUEST['repos'], "\n"); - printf("Alternativamente puede hacer un checkout con: svn co svn+ssh://portal.mecon.ar/var/lib/svn/%s si tiene acceso via ssh.\n", $_REQUEST['repos']); - printf('Volver', $_SERVER['PHP_SELF']); - echo ''; - -} else { - -?> - - - - diff --git a/subversion/sapo/sapo.py b/subversion/sapo/sapo.py index 7b0bd4b..f73a541 100755 --- a/subversion/sapo/sapo.py +++ b/subversion/sapo/sapo.py @@ -5,7 +5,7 @@ # Config. -svncreate = 'sudo /usr/local/bin/svncreate' +svncreate = './svncreate' import sys import os @@ -17,12 +17,6 @@ import cgitb # Para que tire errores más verborrágicos. cgitb.enable() -def is_in(elem, lst): - for e in lst: - if elem == e: - return True - return False - class FormError(Exception): def __init__(self, value): self.value = value @@ -48,29 +42,16 @@ def print_footer(): """ def print_form(form): - def selected(user): - if is_in(user, form.getlist('users')): - return ' selected' - return '' - repos = '' if form.getfirst('repos'): repos = form.getfirst('repos') - desc = '' - if form.getfirst('desc'): - desc = form.getfirst('desc') print """\ +

""" + Nombre del repositorio: + + +

""" % repos def print_repos(repos): url = 'http://portal.mecon.ar/svn/%s/tronco/' % repos @@ -79,19 +60,8 @@ def print_repos(repos): #print 'Alternativamente puede hacer un checkout con: svn co svn+ssh://portal.mecon.ar/var/lib/svn/%s si tiene acceso via ssh.\n' % repos print '

Volver

' -def get_users(file): - users = [] - f = open(file, 'r') - lines = f.readlines() - for line in lines: - users.append(line.strip().split(':')[0]) - f.close() - return users - def check_form(form): check_cond(form.has_key('repos'), 'No se especificó el nombre del repositorio.') - check_cond(form.has_key('desc'), 'No se especificó la descripción del repositorio.') - check_cond(form.has_key('users'), 'No se especificaron usuarios habilitados para escribir en el repositorio.') check_cond(re.match('^[\w\d]+$', form['repos'].value), 'El nombre del repositorio no es válido (sólo puede tener caracteres alfanuméricos).') @@ -114,10 +84,7 @@ try: check_form(form) print '

'
         repos = escape(form.getfirst('repos'))
-        desc = escape(form.getfirst('desc'))
-        usrs = ' '
-        usrs = escape(usrs.join(form.getlist('users')))
-        cmd = "%s '%s' '%s' '%s'" % (svncreate, repos, desc, usrs)
+        cmd = "%s '%s'" % (svncreate, repos)
         sys.stdout.flush()
         status = os.system(cmd)
         print '

' diff --git a/subversion/sapo/svncreate b/subversion/sapo/svncreate index 0cf6681..8f4bf66 100755 --- a/subversion/sapo/svncreate +++ b/subversion/sapo/svncreate @@ -2,36 +2,19 @@ # $Id$ repos_root=/var/lib/svn -repos_www=/svn -template=/etc/svn/template.conf sistema_base=sistema repos=$1 -desc=$2 -users=$3 if [ -r $repos_root/$repos ]; then echo "ERROR: El repositorio $repos ya existe." exit 1 fi echo "Creando repositorio en $repos_root/$repos..." -#svnadmin create $repos_root/$repos cp -a $repos_root/$sistema_base $repos_root/$repos echo "Corrigiendo permisos de $repos_root/$repos..." chown -R .src $repos_root/$repos chmod -R g=u $repos_root/$repos -echo "Agregando repositorio $repos al Apache2 en $repos_www..." -sed -e "s|{REPOS}|$repos|" -e "s/{DESC}/$desc/" \ - -e "s|{REPOS_ROOT}|$repos_root/$repos|" \ - -e "s|{REPOS_WWW}|$repos_www/$repos|" \ - $template >> /etc/svn/apache.conf - -echo "Agregando grupo $repos con los usuarios $users..." -echo "$repos: $users" >> /etc/svn/group - -echo "Reiniciando Apache2..." -/etc/init.d/apache2 reload - echo "Finalizado." diff --git a/subversion/sapo/template.conf b/subversion/sapo/template.conf deleted file mode 100644 index dab5336..0000000 --- a/subversion/sapo/template.conf +++ /dev/null @@ -1,11 +0,0 @@ - -# {REPOS} - {DESC} - - - SVNReposName "{DESC}" - - - Require group {REPOS} - - - -- 2.43.0