[evolvis-commits] r16241: Remove some (very rarely used) configurability to increase determinism

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 01:04:40 CET 2011


Author: mirabilos
Date: 2011-03-01 01:04:40 +0100 (Tue, 01 Mar 2011)
New Revision: 16241

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
   trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.templates.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/src/etc/templates/local.pl
Log:
Remove some (very rarely used) configurability to increase determinism

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2011-03-01 00:04:38 UTC (rev 16240)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/db-upgrade.pl	2011-03-01 00:04:40 UTC (rev 16241)
@@ -19,9 +19,9 @@
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
-    $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
+    $sys_ldap_base_dn $sys_ldap_host $admin_password
     $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
-    $skill_list $libdir $sqldir/ ;
+    $libdir $sqldir/ ;
 
 require ("/etc/gforge/local.pl") ; 
 $libdir="/usr/share/gforge/lib";
@@ -149,7 +149,7 @@
 
 	      my ($login, $md5pwd, $email, $noreplymail, $date) ;
 
-	      $login = $admin_login ;
+	      $login = 'admin' ;
 	      $md5pwd = 'INVALID' ;
 	      $email = $server_admin ;
 	      $noreplymail="noreply\@$domain_name" ;
@@ -188,7 +188,7 @@
 	  if (&is_lesser ($version, $target)) {
 	      &debug ("Inserting skills.") ;
 
-	      foreach my $skill (split m/;/, $skill_list) {
+	      foreach my $skill (split m/;/, "Ada;C;C++;HTML;LISP;Perl;PHP;Python;SQL") {
 		  push @reqlist, "INSERT INTO people_skill (name) VALUES ('$skill')" ;
 	      }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.config.dsfh-in	2011-03-01 00:04:38 UTC (rev 16240)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.config.dsfh-in	2011-03-01 00:04:40 UTC (rev 16241)
@@ -14,7 +14,6 @@
 #DSFHELPER:dbhost-variables#
 #DSFHELPER:dbpasswd-variables#
 
-db_input low @OLDPACKAGE@/shared/admin_login || true
 db_fget @OLDPACKAGE@/shared/admin_password seen || true
 if [ "$RET" = "false" ]; then
     if [ "$(get_pw @OLDPACKAGE@/shared/admin_password high)" = "not-asked" ] ; then
@@ -33,11 +32,9 @@
 #DSFHELPER:downloadhost-variables#
 #DSFHELPER:groupid-variables#
 
-db_input low @OLDPACKAGE@/shared/skill_list || true
-
 db_go || true
 
-vars="admin_login admin_password skill_list"
+vars="admin_password"
 update_mainconffile $vars
 
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2011-03-01 00:04:38 UTC (rev 16240)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2011-03-01 00:04:40 UTC (rev 16241)
@@ -81,10 +81,8 @@
 	v=0
 	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure || v=$?
 	if test x"$v" = x"100"; then
-	    db_get @OLDPACKAGE@/shared/admin_login || true
-	    admin_login="$RET"
 	    db_get @OLDPACKAGE@/shared/admin_password || true
-	    /usr/share/gforge/bin/forge_set_password "$admin_login" "$RET"
+	    /usr/share/gforge/bin/forge_set_password admin "$RET"
 	elif test x"$v" != x"0"; then
 	    exit $v
 	fi

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.templates.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2011-03-01 00:04:38 UTC (rev 16240)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2011-03-01 00:04:40 UTC (rev 16241)
@@ -29,15 +29,6 @@
 
 #DSFHELPER:dbpasswd-variables#
 
-Template: @PACKAGE@/shared/admin_login
-Type: string
-Default: admin
-_Description: @FORGENAME@ administrator login:
- The @FORGENAME@ administrator account will have full privileges on the
- system. It will be used to approve the creation of new projects.
- .
- Please choose the username for this account.
-
 Template: @PACKAGE@/shared/ip_address
 Type: string
 _Description: IP address:
@@ -59,16 +50,6 @@
 _Description: Password confirmation:
  Please re-type the password for confirmation.
 
-Template: @PACKAGE@/shared/skill_list
-Type: string
-Default: Ada;C;C++;HTML;LISP;Perl;PHP;Python;SQL
-_Description: Initial list of skills:
- @FORGENAME@ allows users to define a list of their skills, to be chosen from
- those present in the database. This list is the initial list of
- skills that will enter the database.
- .
- Please enter a semicolon-separated list of skill names.
-
 #DSFHELPER:dbhost-variables#
 
 #DSFHELPER:web-variables#

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/templates/local.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/templates/local.pl	2011-03-01 00:04:38 UTC (rev 16240)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/templates/local.pl	2011-03-01 00:04:40 UTC (rev 16241)
@@ -28,8 +28,6 @@
 chomp $sys_ldap_base_dn ;
 $sys_ldap_host = qx!$fgcpath/forge_get_config ldap_host!;
 chomp $sys_ldap_host ;
-$skill_list = '{skill_list}' ;
-$admin_login = '{admin_login}' ;
 $server_admin = qx!$fgcpath/forge_get_config admin_email!;
 $peerrating_groupid = qx!$fgcpath/forge_get_config peer_rating_group!;
 chomp $peerrating_groupid ;



More information about the evolvis-commits mailing list