[Fusionforge-commits] r14101 - branches/Branch_5_1/src/debian/dsf-helper
Olivier Berger
olberger at fusionforge.org
Fri Aug 12 12:53:10 CEST 2011
Author: olberger
Date: 2011-08-12 12:53:10 +0200 (Fri, 12 Aug 2011)
New Revision: 14101
Modified:
branches/Branch_5_1/src/debian/dsf-helper/common-variables.config
branches/Branch_5_1/src/debian/dsf-helper/create-random-pw.config
branches/Branch_5_1/src/debian/dsf-helper/dbhost-variables.config
branches/Branch_5_1/src/debian/dsf-helper/dbpasswd-variables.config
branches/Branch_5_1/src/debian/dsf-helper/downloadhost-variables.config
branches/Branch_5_1/src/debian/dsf-helper/get-pw-from-debconf.config
branches/Branch_5_1/src/debian/dsf-helper/groupid-variables.config
branches/Branch_5_1/src/debian/dsf-helper/handle-mainconffile.config
branches/Branch_5_1/src/debian/dsf-helper/host-variables.config
branches/Branch_5_1/src/debian/dsf-helper/lists-variables.config
branches/Branch_5_1/src/debian/dsf-helper/shellhost-variables.config
branches/Branch_5_1/src/debian/dsf-helper/users-variables.config
Log:
Adding bits of hints on where the DSFHELPER includes come from
Modified: branches/Branch_5_1/src/debian/dsf-helper/common-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/common-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/common-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from common-variables.config
db_get @PACKAGE@/shared/domain_name || true
if [ -z "$RET" ] ; then
hostname=$(hostname -f 2>/dev/null) || hostname=localhost
@@ -19,3 +20,4 @@
vars="system_name domain_name server_admin"
update_mainconffile $vars
+#- end of included section from common-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/create-random-pw.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/create-random-pw.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/create-random-pw.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from create-random-pw.config
gen_random_pw () { # Generate a random password
if [ -c /dev/urandom ]; then # ...using /dev/urandom when possible
tmp=$(dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8)
@@ -9,3 +10,4 @@
fi
echo $tmp
}
+#- end of included section from create-random-pw.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/dbhost-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/dbhost-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/dbhost-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from dbhost-variables.config
db_fget @PACKAGE@/shared/db_host seen || true
[ "$RET" = "false" ] && db_set @PACKAGE@/shared/db_host 127.0.0.1
db_input medium @PACKAGE@/shared/db_host || true
@@ -12,3 +13,4 @@
vars="db_host db_name db_user"
update_mainconffile $vars
+#- end of included section from dbhost-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/dbpasswd-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/dbpasswd-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/dbpasswd-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from dbpasswd-variables.config
db_fget @PACKAGE@/shared/db_password seen || true
if [ "$RET" = "false" ]; then
db_set @PACKAGE@/shared/db_password $(gen_random_pw)
@@ -12,3 +13,4 @@
vars="db_password"
update_mainconffile $vars
+#- end of included section from dbpasswd-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/downloadhost-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/downloadhost-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/downloadhost-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from downloadhost-variables.config
db_fget @PACKAGE@/shared/download_host seen || true
if [ "$RET" = "false" ] ; then
db_get @PACKAGE@/shared/domain_name
@@ -9,3 +10,4 @@
vars="download_host"
update_mainconffile $vars
+#- end of included section from downloadhost-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/get-pw-from-debconf.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/get-pw-from-debconf.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/get-pw-from-debconf.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from get-pw-from-debconf.config
get_pw () { # Use Debconf to get a password
get_pw__pwname=$1
get_pw__priority=$2
@@ -35,3 +36,4 @@
;;
esac
}
+#- end of included section from get-pw-from-debconf.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/groupid-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/groupid-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/groupid-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from groupid-variables.config
db_input low @PACKAGE@/shared/newsadmin_groupid || true
db_input low @PACKAGE@/shared/statsadmin_groupid || true
db_input low @PACKAGE@/shared/peerrating_groupid || true
@@ -6,3 +7,4 @@
vars="newsadmin_groupid statsadmin_groupid peerrating_groupid"
update_mainconffile $vars
+#- end of included section from groupid-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/handle-mainconffile.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/handle-mainconffile.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/handle-mainconffile.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from handle-mainconffile.config
###
# Functions to handle the main @FORGENAME@ configuration file
###
@@ -59,3 +60,4 @@
echo "$key=$val" >> $mainconffile
fi
}
+#- end of included section from handle-mainconffile.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/host-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/host-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/host-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from host-variables.config
db_fget @PACKAGE@/shared/ip_address seen || true
if [ "$RET" = "false" ] ; then
db_get @PACKAGE@/shared/domain_name
@@ -11,3 +12,4 @@
vars="ip_address server_admin"
update_mainconffile $vars
+#- end of included section from host-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/lists-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/lists-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/lists-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from lists-variables.config
db_fget @PACKAGE@/shared/lists_host seen || true
if [ "$RET" = "false" ] ; then
db_get @PACKAGE@/shared/domain_name
@@ -10,3 +11,4 @@
vars="lists_host"
update_mainconffile $vars
+#- end of included section from lists-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/shellhost-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/shellhost-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/shellhost-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- beginning of included section from shellhost-variables.config
db_fget @PACKAGE@/shared/shell_host seen || true
if [ "$RET" = "false" ] ; then
db_get @PACKAGE@/shared/domain_name
@@ -9,3 +10,4 @@
vars="shell_host"
update_mainconffile $vars
+#- end of included section from shellhost-variables.config
Modified: branches/Branch_5_1/src/debian/dsf-helper/users-variables.config
===================================================================
--- branches/Branch_5_1/src/debian/dsf-helper/users-variables.config 2011-08-10 13:08:51 UTC (rev 14100)
+++ branches/Branch_5_1/src/debian/dsf-helper/users-variables.config 2011-08-12 10:53:10 UTC (rev 14101)
@@ -1,3 +1,4 @@
+#- 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
@@ -10,3 +11,4 @@
vars="users_host"
update_mainconffile $vars
+#- end of included section from users-variables.config
More information about the Fusionforge-commits
mailing list