[Fusionforge-commits] r15597 - in branches/Branch_5_2: . src/debian/dsf-helper src/debian/dsf-in

Roland Mas lolando at fusionforge.org
Tue May 29 18:48:28 CEST 2012


Author: lolando
Date: 2012-05-29 18:48:26 +0200 (Tue, 29 May 2012)
New Revision: 15597

Removed:
   branches/Branch_5_2/src/debian/dsf-helper/users-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/users-variables.templates
   branches/Branch_5_2/src/debian/dsf-in/dns-bind9.config.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/mta-postfix.config.dsfh-in
Modified:
   branches/Branch_5_2/
   branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/common.postinst
   branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in
Log:
Start replacing dsf-helper with plain debconf to remove the need for the fusionforge.conf file

Deleted: branches/Branch_5_2/src/debian/dsf-helper/users-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/users-variables.config	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-helper/users-variables.config	2012-05-29 16:48:26 UTC (rev 15597)
@@ -1,14 +0,0 @@
-#- beginning of included section from users-variables.config
-db_fget @PACKAGE@/shared/users_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/users_host users.$RET
-fi
-
-db_input medium @PACKAGE@/shared/users_host || true
-
-db_go || true
-
-vars="users_host"
-update_mainconffile $vars
-#- end of included section from users-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/users-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/users-variables.templates	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-helper/users-variables.templates	2012-05-29 16:48:26 UTC (rev 15597)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/users_host
-Type: string
-_Description: User mail redirector server:
- Please enter the host name of the server that will host the @FORGENAME@ user mail
- redirector.
- .
- It should not be the same as the main @FORGENAME@ host.

Modified: branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -3,9 +3,21 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:handle-mainconffile#
+db_get @PACKAGE@/shared/web_host || true
+if [ -z "$RET" ] ; then
+   hostname=$(hostname -f 2>/dev/null) || hostname=localhost
+   db_set @PACKAGE@/shared/web_host $hostname
+fi
+db_input medium @PACKAGE@/shared/web_host || true
+db_go || true
 
-create_mainconffile
-init_debconf_from_mainconffile
+db_get @PACKAGE@/shared/server_admin || true
+if [ -z "$RET" ] ; then
+  db_get @PACKAGE@/shared/web_host || true
+  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
+fi
 
-#DSFHELPER:common-variables#
+db_input medium @PACKAGE@/shared/server_admin || true
+db_input low @PACKAGE@/shared/forge_name || true
+
+db_go || true

Modified: branches/Branch_5_2/src/debian/dsf-in/common.postinst
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.postinst	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/common.postinst	2012-05-29 16:48:26 UTC (rev 15597)
@@ -46,18 +46,30 @@
 
 	if [ "$2" = "" ] ; then
 	    # Installation from scratch, let's generate initial config files
-	    if [ ! -e /etc/gforge/config.ini.d/debian-install.ini ] ; then
-		cat > /etc/gforge/config.ini.d/debian-install.ini <<EOF
+	    if [ ! -e /etc/@PACKAGE@/config.ini.d/debian-install.ini ] ; then
+		db_get @PACKAGE@/shared/forge_name || true
+		if [ -z "$RET" ] ; then
+		    forge_name=FusionForge
+		else
+		    forge_name=$RET
+		fi
+		db_get @PACKAGE@/shared/web_host || true
+		if [ -z "$RET" ] ; then
+		    web_host=$(hostname -f)
+		else
+		    web_host=$RET
+		fi
+		cat > /etc/@PACKAGE@/config.ini.d/debian-install.ini <<EOF
 ; This file was generated by the Debian installation system.
 ; You can edit the values here or move them to other files.
 
 [core]
-forge_name=FusionForge
-web_host=$(hostname -f)
+forge_name=$forge_name
+web_host=$web_host
 EOF
 	    fi
-	    if [ ! -e /etc/gforge/config.ini.d/debian-install-secrets.ini ] ; then
-		t=$(mktemp /etc/gforge/config.ini.d/debian-install-secrets.ini.XXXXXX)
+	    if [ ! -e /etc/@PACKAGE@/config.ini.d/debian-install-secrets.ini ] ; then
+		t=$(mktemp /etc/@PACKAGE@/config.ini.d/debian-install-secrets.ini.XXXXXX)
 		pw=
 		db_fget @PACKAGE@/shared/db_password seen || true
 		seen="$RET"
@@ -97,7 +109,7 @@
 
 session_key=$sk
 EOF
-		mv $t /etc/gforge/config.ini.d/debian-install-secrets.ini
+		mv $t /etc/@PACKAGE@/config.ini.d/debian-install-secrets.ini
 	    fi
 	elif dpkg --compare-versions $2 lt 5.0.51-1 ; then
 	    echo "Migrating existing configuration to *.ini files"

Modified: branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -8,3 +8,16 @@
 # changes should be coordinated with translators and reviewers.
 
 #DSFHELPER:common-variables#
+Template: @PACKAGE@/shared/web_host
+Type: string
+_Description: @FORGENAME@ domain or subdomain name:
+ Please enter the domain that will host the @FORGENAME@ installation. Some
+ services (scm, lists, etc.) will be given their own subdomain in that
+ domain.
+
+Template: @PACKAGE@/shared/forge_name
+Type: string
+Default: @FORGENAME@
+_Description: @FORGENAME@ system name:
+ Please enter the name of the @FORGENAME@ system. It is used in various places
+ throughout the system.

Modified: branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -25,13 +25,6 @@
     fi
 fi
 
-#DSFHELPER:host-variables#
-#DSFHELPER:shellhost-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-#DSFHELPER:downloadhost-variables#
-#DSFHELPER:groupid-variables#
-
 db_go || true
 
 vars="admin_password"

Deleted: branches/Branch_5_2/src/debian/dsf-in/dns-bind9.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/dns-bind9.config.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/dns-bind9.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-db_stop

Modified: branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -3,16 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#
-#DSFHELPER:get-pw-from-debconf#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
 if [ -f /etc/aliases. at OLDPACKAGE@-new ] 
 then
 	ucf --debconf-ok /etc/aliases. at OLDPACKAGE@-new /etc/aliases

Deleted: branches/Branch_5_2/src/debian/dsf-in/mta-postfix.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-postfix.config.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-postfix.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#
-#DSFHELPER:get-pw-from-debconf#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-db_stop

Modified: branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in	2012-05-29 14:04:43 UTC (rev 15596)
+++ branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
@@ -15,12 +15,7 @@
 #DSFHELPER:common-variables#
 #DSFHELPER:web-variables#
 #DSFHELPER:groupid-variables#
-# [Disabled] DSFHELPER:users-variables#
-# [Disabled] DSFHELPER:lists-variables#
 #DSFHELPER:downloadhost-variables#
 #DSFHELPER:uploadhost-variables#
 #DSFHELPER:ftpuploadhost-variables#
 #DSFHELPER:jabberhost-variables#
-# [Disabled] DSFHELPER:shellhost-variables#
-# [Disabled] DSFHELPER:dbpasswd-variables#
-# [Disabled] DSFHELPER:dbhost-variables#




More information about the Fusionforge-commits mailing list