[vhffs-dev] [svn] commit: r64 - in trunk: debian/ vhffs-api/src/Vhffs/ vhffs-api/src/Vhffs/Robots/ vhffs-backend/tools/ vhffs-panel/svn/ vhffs-tools/src/

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Tue Jul 26 20:58:27 2005
New Revision: 64

Log:
Add a missing sql script in vhffs-initdb
Fix subversion implemtation, svn_public.pl robot will change subversion reposiutory configuration


Modified:
    trunk/debian/control
    trunk/debian/rules
    trunk/debian/vhffs-configfile.postinst
    trunk/debian/vhffs-configfile.templates
    trunk/debian/vhffs-tuxshell.postinst
    trunk/debian/vhffs-tuxshell.postrm
    trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
    trunk/vhffs-api/src/Vhffs/User.pm
    trunk/vhffs-backend/tools/vhffs-initdb
    trunk/vhffs-panel/svn/prefs.pl
    trunk/vhffs-panel/svn/prefs_save.pl
    trunk/vhffs-tools/src/show_user

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Tue Jul 26 20:58:27 2005
@@ -4,7 +4,7 @@
 Maintainer: Julien Delange <julien@xxxxxxxxx>
 Build-Depends: debhelper(>= 4.0.0)
 Build-Depends-Indep: debhelper(>= 4.0.0)
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.2
 
 Package: vhffs-api
 Section: perl
@@ -56,6 +56,7 @@
 
 Package: vhffs-configfile
 Architecture: all
+Depends: debconf
 Description: configuration file for VHFFS
  This is the main configuration file for VHFFS.
 

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Tue Jul 26 20:58:27 2005
@@ -6,7 +6,6 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=3
 
-export DH_COMPAT=3
 
 INSTDIR = $(CURDIR)/debian/tmp/
 APIDIR = $(CURDIR)/debian/vhffs-api/
@@ -153,7 +152,7 @@
 	dh_installexamples
 #	dh_install
 	dh_installmenu
-#	dh_installdebconf	
+	dh_installdebconf	
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam

Modified: trunk/debian/vhffs-configfile.postinst
==============================================================================
--- trunk/debian/vhffs-configfile.postinst (original)
+++ trunk/debian/vhffs-configfile.postinst Tue Jul 26 20:58:27 2005
@@ -4,21 +4,21 @@
 
 get_debconf()
 {
-    db_get vhffs/create_config
+    db_get vhffs-configfile/create_config
     create_config="$RET"
-    db_get vhffs/datadir
+    db_get vhffs-configfile/datadir
     datadir="$RET"
-    db_get vhffs/pgsql_server
+    db_get vhffs-configfile/pgsql_server
     dbserver="$RET"
-    db_get vhffs/dbname
+    db_get vhffs-configfile/dbname
     dbname="$RET"
-    db_get vhffs/dbuser
+    db_get vhffs-configfile/dbuser
    	dbuser="$RET"
-    db_get vhffs/dbpass
+    db_get vhffs-configfile/dbpass
     dbpass="$RET"
-    db_get vhffs/admin
+    db_get vhffs-configfile/admin
     admin="$RET"
-    db_get vhffs/title
+    db_get vhffs-configfile/title
     title="$RET"
 }
 

Modified: trunk/debian/vhffs-configfile.templates
==============================================================================
--- trunk/debian/vhffs-configfile.templates (original)
+++ trunk/debian/vhffs-configfile.templates Tue Jul 26 20:58:27 2005
@@ -1,45 +1,44 @@
-Template: vhffs/create_config
+Template: vhffs-configfile/create_config
 Type: boolean
 Default: true
 _Description: Automatically create VHFFS configuration files?
 
-Template: vhffs/datadir
+Template: vhffs-configfile/datadir
 Type: string
 Default: /data
 _Description: Where VHFFS should put data ?
 
-Template: vhffs/pgsql_server
+Template: vhffs-configfile/pgsql_server
 Type: string
 Default: localhost
 _Description: Database server for VHFFS database
 
-Template: vhffs/pgsql_port
+Template: vhffs-configfile/pgsql_port
 Type: string
 Default: 5432
 _Description: On what port does the database server listen?
 
-Template: vhffs/dbname
+Template: vhffs-configfile/dbname
 Type: string
 Default: vhffs
 _Description: VHFFS database name
 
-Template: vhffs/dbuser
+Template: vhffs-configfile/dbuser
 Type: string
 Default: vhffs
 _Description: VHFFS database user
 
-Template: vhffs/dbpass
+Template: vhffs-configfile/dbpass
 Type: string
-Default: 
 _Description: VHFFS database password
 
-Template: vhffs/admin
+Template: vhffs-configfile/admin
 Type: string
 Default: root@localhost
 _Description: VHFFS administrator email address
 
-Template: vhffs/title
+Template: vhffs-configfile/title
 Type: string
-_Default: My host
+Default: My host
 _Description: Title for VHFFS
 

Modified: trunk/debian/vhffs-tuxshell.postinst
==============================================================================
--- trunk/debian/vhffs-tuxshell.postinst (original)
+++ trunk/debian/vhffs-tuxshell.postinst Tue Jul 26 20:58:27 2005
@@ -4,7 +4,7 @@
 
 case "$1" in
 	configure)
-		cat "/bin/tuxshell" >> /etc/shells
+		/usr/sbin/add-shell /bin/tuxshell
 	;;
     abort-upgrade|abort-remove|abort-deconfigure)
 

Modified: trunk/debian/vhffs-tuxshell.postrm
==============================================================================
--- trunk/debian/vhffs-tuxshell.postrm (original)
+++ trunk/debian/vhffs-tuxshell.postrm Tue Jul 26 20:58:27 2005
@@ -8,7 +8,7 @@
 
 case "$1" in
     remove)
-    	sed -i -e "s/tuxshell//g" /etc/shells
+		/usr/sbin/remove-shell /bin/tuxshell
 	;;
 	purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;

Modified: trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Svn.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Robots/Svn.pm Tue Jul 26 20:58:27 2005
@@ -38,7 +38,14 @@
 	{
 		if( $line =~ /.*anon\-access.*/ )
 		{
-			$line = "anon-access = read\n";
+			if( $svn->is_public == 1 )
+			{
+				$line = "anon-access = read\n";
+			}
+			else
+			{
+				$line = "#anon-access = read\n";
+			}
 		}
 		print FILE $line;
 	}

Modified: trunk/vhffs-api/src/Vhffs/User.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/User.pm (original)
+++ trunk/vhffs-api/src/Vhffs/User.pm Tue Jul 26 20:58:27 2005
@@ -89,7 +89,7 @@
     $query = "SELECT * FROM vhffs_users where username='".$self->{'username'}."'" if( defined $self->{'username'} );
     
     
-    $request = $self->{'db'}->{'DB_READ'}->prepare($query) or return -2;
+    $request = $self->{'db'}->{'DB_READ'}->prepare( $query ) or return -2;
     
     $rows = $request->execute() or return -2;
 

Modified: trunk/vhffs-backend/tools/vhffs-initdb
==============================================================================
--- trunk/vhffs-backend/tools/vhffs-initdb (original)
+++ trunk/vhffs-backend/tools/vhffs-initdb Tue Jul 26 20:58:27 2005
@@ -4,7 +4,7 @@
 #This script should be run with the identity of the postgres superuser
 
 SCRIPTDIR="/home/soda/vhffs/vhffs-backend/src/pgsql"
-FILES="create_object.sql create_object_history.sql create_acl.sql create_user.sql create_use_info.sql create_groups.sql create_groups_info.sql create_user_info.sql create_shadow_view.sql create_pass_view.sql create_panel_prefs.sql create_notes.sql create_mxdomain.sql create_boxes.sql create_forward.sql create_dns.sql create_cvs.sql create_ml.sql create_mysql.sql create_postgreql.sql create_svn.sql create_mailings.sql create_ml.sql"
+FILES="create_object.sql create_object_history.sql create_acl.sql create_user.sql create_use_info.sql create_groups.sql create_groups_info.sql create_user_info.sql create_user_group.sql create_shadow_view.sql create_pass_view.sql create_panel_prefs.sql create_notes.sql create_mxdomain.sql create_boxes.sql create_forward.sql create_dns.sql create_cvs.sql create_ml.sql create_mysql.sql create_postgreql.sql create_svn.sql create_mailings.sql create_ml.sql"
 DB=$1
 DBUSER=$2
 
@@ -16,7 +16,19 @@
 
 echo "Remove old users and databases and create new ones"
 /usr/bin/dropdb $DB 2>/dev/null 1>&2|| true
+
+if [ $? -ne 0 ]; then
+	echo "Error while delete old database"
+	exit 1
+fi
+
 /usr/bin/dropuser $DBUSER 2>/dev/null 1>&2|| true
+
+if [ $? -ne 0 ]; then
+	echo "Error while delete old user"
+	exit 1
+fi
+
 /usr/bin/createuser --no-createdb --no-adduser $DBUSER 2>/dev/null 1>&2|| true
 /usr/bin/createdb -O $DBUSER $DB 2>/dev/null 1>&2|| true
 

Modified: trunk/vhffs-panel/svn/prefs.pl
==============================================================================
--- trunk/vhffs-panel/svn/prefs.pl (original)
+++ trunk/vhffs-panel/svn/prefs.pl Tue Jul 26 20:58:27 2005
@@ -60,7 +60,7 @@
 elsif( ( $svn->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
 {
 	$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
-    $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
+    $message = gettext( "This object is not functionnal yet. Please wait creation, moderation or modification.");
 	$template->param( MESSAGE => $message );
 }
 else

Modified: trunk/vhffs-panel/svn/prefs_save.pl
==============================================================================
--- trunk/vhffs-panel/svn/prefs_save.pl (original)
+++ trunk/vhffs-panel/svn/prefs_save.pl Tue Jul 26 20:58:27 2005
@@ -64,6 +64,7 @@
 	{
 		$svn->set_private;
 	}
+	$svn->set_status( Vhffs::Constants::WAITING_FOR_MODIFICATION );
 	
 	if( $svn->commit < 0 )
 	{

Modified: trunk/vhffs-tools/src/show_user
==============================================================================
--- trunk/vhffs-tools/src/show_user (original)
+++ trunk/vhffs-tools/src/show_user Tue Jul 26 20:58:27 2005
@@ -5,7 +5,6 @@
 
 my $vhffs = init Vhffs::Main;
 
-print $ARGV[0];
 
 my $users = Vhffs::User::getall( $vhffs , $ARGV[0] );
 my $user;