[Pkg-ocaml-maint-commits] r2860 - in
/trunk/packages/mldonkey/trunk/debian: changelog
mldonkey-server.config mldonkey-server.postinst mldonkey-server.templates
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Fri Jun 23 08:41:25 UTC 2006
Author: smimram
Date: Fri Jun 23 08:41:23 2006
New Revision: 2860
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2860
Log:
Removed some debconf templates.
Modified:
trunk/packages/mldonkey/trunk/debian/changelog
trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates
Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2860&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Fri Jun 23 08:41:23 2006
@@ -7,6 +7,11 @@
* init.d script of mldonkey-server called with stop now exits with 0 even
when the server was not running, closes: #338875.
* Correcly set $HOME in mldonkey_server, closes: #355913.
+ * Updated debconf templates and removed mldonkey-server/mldonkey_umask,
+ mldonkey-server/client_name and mldonkey-server/plugin.
+ * Removed unused debconf templates: mldonkey-server/config_exist_no_options,
+ mldonkey-server/config_exist_no_dir and
+ mldonkey-server/shared_directories, closes: #332320.
* Updated the Czech debconf templates translation, closes: #335353.
* Added a .desktop file for mldonkey-gui.
* Updated standards version to 3.7.2, no changes needed.
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.config?rev=2860&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.config (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.config Fri Jun 23 08:41:23 2006
@@ -11,7 +11,7 @@
if [ -e $CONFIGFILE ]; then
MLDONKEY_DIR=
MLDONKEY_GROUP=
- MLDONKEY_UMASK=
+ MLDONKEY_UMASK=0022
MAX_ALIVE=
LAUNCH_AT_STARTUP=
MLDONKEY_NICENESS=
@@ -23,10 +23,6 @@
if [ "$MLDONKEY_GROUP" != "" ]; then
db_set mldonkey-server/mldonkey_group $MLDONKEY_GROUP
- fi
-
- if [ "$MLDONKEY_UMASK" != "" ]; then
- db_set mldonkey-server/mldonkey_umask $MLDONKEY_UMASK
fi
if [ "$MAX_ALIVE" != "" ]; then
@@ -47,10 +43,9 @@
fi
if [ -x /usr/bin/mldonkey_options ] && [ -e $MLDONKEY_DIR/downloads.ini ]; then
- db_set mldonkey-server/client_name `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g client_name`
db_set mldonkey-server/max_hard_upload_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_upload_rate`
db_set mldonkey-server/max_hard_download_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_download_rate`
-# BUG : We should also fetch the default plugin
+# BUG: We should also fetch the default plugin
fi
#db_version 2.0
@@ -61,7 +56,6 @@
# If it is the first time we install : set a default hostname
if [ ! -n "$MLDONKEY_DIR" ] || [ ! -d $MLDONKEY_DIR ] || [ ! -f $MLDONKEY_DIR/downloads.ini ]; then
client_name=`/bin/hostname`
- db_set mldonkey-server/client_name "$client_name"
fi
# Do we start at startup
@@ -116,16 +110,7 @@
fi
- db_input low mldonkey-server/mldonkey_umask || true
- db_go
-
db_input low mldonkey-server/mldonkey_niceness || true
- db_go
-
- db_input medium mldonkey-server/client_name || true
- db_go
-
- db_input medium mldonkey-server/plugin || true
db_go
db_input medium mldonkey-server/max_hard_download_rate || true
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst?rev=2860&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst Fri Jun 23 08:41:23 2006
@@ -19,8 +19,7 @@
# Handling debconf values #
###########################
- db_get mldonkey-server/mldonkey_umask
- mldonkey_umask="$RET"
+ mldonkey_umask=0022
umask $mldonkey_umask
db_get mldonkey-server/run_as_user
@@ -35,10 +34,7 @@
db_get mldonkey-server/mldonkey_niceness
mldonkey_niceness="$RET"
- db_get mldonkey-server/client_name
- client_name="$RET"
-
- db_get mldonkey-server/plugin
+ client_name=`/bin/hostname`
enable_directconnect=false
enable_opennap=false
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates?rev=2860&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates Fri Jun 23 08:41:23 2006
@@ -1,42 +1,13 @@
-Template: mldonkey-server/config_exist_no_options
-Type: note
-_Description: Warning
- A configuration for MLDonkey has been detected, but
- the mldonkey_options executable cannot be found. Therefore,
- the settings from the current MLDonkey configuration cannot
- be fetched.
- .
- This is a typical error, if you have uninstalled the mldonkey-server
- package and later reinstall it.
- .
- Ignore this message in case you think there is nothing to be
- saved from your current configuration.
- .
- Your configuration will be saved to downloads.ini.dpkg.
-
-Template: mldonkey-server/config_exist_no_dir
-Type: note
-_Description: Warning
- A former installation of mldonkey-server has been detected, but
- we cannot find the directory coming with it.
- .
- The installation will create a fresh directory with new .ini
- configuration files.
- .
- Afterwards you can copy your old .ini configuration files to this new
- directory and re-run "dpkg-reconfigure mldonkey-server" to update
- the remaining debconf values stored in /etc/default/mldonkey-server.
-
Template: mldonkey-server/fasttrack_problem
Type: note
_Description: Bug #200500
Previous versions of mldonkey-server suffer from a serious DFSG policy
violation.
.
- The plugin for the fasttrack protocol (e.g. used by kazaa) of
- mldonkey-server was made with illegal coding practice. This version
- fixes the problem by removing this plugin from the MLDonkey package.
- Any fasttrack sources will be filtered out of your files.ini.
+ The plugin for the fasttrack protocol (e.g. used by kazaa) of mldonkey-server
+ was made with illegal coding practice. This version fixes the problem by
+ removing this plugin from the MLDonkey package. Any fasttrack sources will be
+ filtered out of your files.ini.
.
Your entire fasttrack upload will disappear with the next restart of the
mldonkey server.
@@ -46,156 +17,105 @@
Template: mldonkey-server/launch_at_startup
Type: boolean
Default: false
-_Description: Launch at startup?
+_Description: Launching MLDonkey at startup
Do you want to launch MLDonkey as a system service?
.
- If you choose yes, each time your machine starts, the MLDonkey server will be
- started.
+ If enabled, each time your machine starts, the MLDonkey server will be started.
.
- If you choose no, you will need to launch MLDonkey yourself each time you want to
+ Otherwise, you will need to launch MLDonkey yourself each time you want to
use it.
Template: mldonkey-server/run_as_user
Type: string
Default: mldonkey
-_Description: MLDonkey user:
+_Description: MLDonkey user
Define the user who will run the MLDonkey server process.
.
- Please do not choose a real user. For security reasons it is
- better if this user does not own any other data than the
- MLDonkey share.
+ Please do not choose a real user. For security reasons it is better if this
+ user does not own any other data than the MLDonkey share.
.
- You will use this user account to share and get data from the
- peer-to-peer networks.
+ You will use this user account to share and get data from the peer-to-peer
+ networks.
.
- This user will be a system user (if created). You won't be able
- to login into your system with this user name.
+ This user will be a system user (if created). You won't be able to login into
+ your system with this user name.
Template: mldonkey-server/mldonkey_group
Type: string
Default: mldonkey
-_Description: MLDonkey group:
+_Description: MLDonkey group
Define the group which will run the MLDonkey server process.
.
- Please do not choose a real group. For security reasons it is
- better if this group does not own any other data than the MLDonkey share.
+ Please do not choose a real group. For security reasons it is better if this
+ group does not own any other data than the MLDonkey share.
.
- Users of this group can start and stop the MLDonkey server and
- can also access the files fetched from the peer-to-peer networks.
+ Users of this group can start and stop the MLDonkey server and can also access
+ the files fetched from the peer-to-peer networks.
Template: mldonkey-server/reown_file
Type: boolean
Default: false
-_Description: Move old files?
- You have changed the MLDonkey user. You can change the ownership of
- your files to the new user.
+_Description: Changing owner of old files
+ You have changed the MLDonkey user. You can change the ownership of your files
+ to the new user.
.
Proceed changes?
.
- PS: the former user won't be deleted from /etc/passwd, you will
- have to do it yourself later (e.g. with deluser(8)), or you keep it
- along with the old configuration.
+ PS: the former user won't be deleted from /etc/passwd, you will have to do it
+ yourself later (e.g. with deluser(8)), or you keep it along with the old
+ configuration.
Template: mldonkey-server/mldonkey_dir
Type: string
Default: /var/lib/mldonkey
-_Description: MLDonkey directory:
+_Description: MLDonkey directory
Define the directory to which the MLDonkey server will be chdired and chrooted.
.
- The .ini configuration files, incoming and shared directories will be in this directory.
+ The .ini configuration files, incoming and shared directories will be in this
+ directory.
.
- Chroot support is not complete. For now, chroot is not possible, but it
- may be enabled in the near future.
+ Chroot support is not complete. For now, chroot is not possible, but it may be
+ enabled in the near future.
Template: mldonkey-server/mldonkey_move
Type: boolean
Default: false
-_Description: Move the old configuration?
- You have changed the mldonkey directory. You can move the old files
- to this new directory.
+_Description: Moving the old configuration
+ You have changed the mldonkey directory. You can move the old files to this new
+ directory.
.
- If you choose no, the old directory won't be deleted. You will have to
- do it yourself.
+ If you choose no, the old directory won't be deleted. You will have to do it
+ yourself.
.
Proceed changes?
-Template: mldonkey-server/mldonkey_umask
-Type: string
-Default: 0022
-_Description: Umask of MLDonkey:
- Since MLDonkey will run as a system user, it is not easy to move/delete
- files from the incoming dir. By setting a umask, you can provide access to these
- files for MLDonkey's group or all users.
- .
- Examples: 0002 will give rw access to MLDonkey's group, 0000 will give
- access to all users.
-
Template: mldonkey-server/mldonkey_niceness
Type: string
-_Description: Niceness of MLDonkey:
+_Description: Niceness of MLDonkey
MLDonkey uses heavy calculation from time to time (like hashing very big
files). It should be a good idea to set a very kind level of niceness,
depending on what ressources you want to give to MLDonkey.
.
- You can set values from -20 to 20. The bigger the niceness, the lower the priority
- of MLDonkey processes.
-
-Template: mldonkey-server/shared_directories
-Type: string
-Default: share
-_Description: Shared directories:
- List of directories you want to share. By default, the incoming directory will
- always be shared.
- .
- The syntax of this list is a list of strings separated by ";". For example:
- share ; mp3
- .
- Since MLDonkey will be chrooted, you need to specify shared dirs with
- regards to the new root directory of MLDonkey (e.g. if you want to share
- /var/lib/mldonkey/share and MLDonkey user's home is /var/lib/mldonkey,
- you need to write "share" or "/share").
- .
- Chroot support is not complete. For now, chroot is not possible, but it may be enabled
- in the near future.
-
-Template: mldonkey-server/client_name
-Type: string
-_Description: MLDonkey client name:
- The name of your server. This is the name that will be presented to other
- users of the peer-to-peer networks.
- .
- You could use the name of your website. Example: http://me.my.home/
- .
- Don't use " or any other special characters.
-
-Template: mldonkey-server/plugin
-Type: multiselect
-Choices: Directconnect, Opennap, Overnet, Soulseek, Bittorent, Gnutella
-Default: Directconnect, Opennap, Overnet, Soulseek, Bittorent, Gnutella
-Description: MLDonkey Plugins:
- MLDonkey can use several different filesharing networks. Choose the networks
- you want to use with your server.
- .
- The EDonkey network is always enabled. Take a look at the different port settings,
- you will need to make, if you use a firewall.
+ You can set values from -20 to 20. The bigger the niceness, the lower the
+ priority of MLDonkey processes.
Template: mldonkey-server/max_hard_download_rate
Type: string
Default: 0
-_Description: Maximal download speed (kB/s):
- Set the maximal download rate. It can be useful to limit this rate, in
- order to always have a minimal bandwidth for other internet applications.
+_Description: Maximal download speed (kB/s)
+ Set the maximal download rate. It can be useful to limit this rate, in order to
+ always have a minimal bandwidth for other internet applications.
.
- It has also been noticed that a full use of the bandwidth could cause
- problems with DSL connection handling. This is not a rule, it is just
- based on a few experiments.
+ It has also been noticed that a full use of the bandwidth could cause problems
+ with DSL connection handling. This is not a rule, it is just based on a few
+ experiments.
.
0 means no limit.
Template: mldonkey-server/max_hard_upload_rate
Type: string
Default: 0
-_Description: Maximal upload speed (kB/s):
+_Description: Maximal upload speed (kB/s)
Set the maximal upload rate. You must keep in mind that a peer-to-peer
network is based on sharing. Do not use a very low rate.
.
@@ -210,29 +130,29 @@
Template: mldonkey-server/max_alive
Type: string
Default: 48
-_Description: Maximal time to live for the server:
+_Description: Maximal time to live for the server
MLDonkey needs to be restarted from time to time. This is safer for memory
- consumption and all. You need to set the time between automatic restarts
- (in hours).
+ consumption and all. You need to set the time between automatic restarts (in
+ hours).
.
- The only problem with this is that you will loose some upload credits. You
- can set this variable to a very high value in order to be sure to have a
- sufficient time to gather a lot of credits.
+ The only problem with this is that you will loose some upload credits. You can
+ set this variable to a very high value in order to be sure to have enough time
+ to gather a lot of credits.
.
For example: 24 for one day, 168 for one week.
Template: mldonkey-server/password
Type: password
-_Description: Password of admin user:
- As of version 2.04rc1, a new user management appears. The password is
- encrypted and stored in downloads.ini.
+_Description: Password of admin user
+ As of version 2.04rc1, a new user management appears. The password is encrypted
+ and stored in downloads.ini.
.
- If you want to add a new user for MLDonkeys user management or
- want to change the password, refer to /usr/share/doc/mldonkey-server/README.Debian.
+ If you want to add a new user for MLDonkeys user management or want to change
+ the password, refer to /usr/share/doc/mldonkey-server/README.Debian.
Template: mldonkey-server/repassword
Type: password
-_Description: Retype password of the admin user:
+_Description: Retype password of the admin user
Please confirm your admin's password.
Template: mldonkey-server/false_password
More information about the Pkg-ocaml-maint-commits
mailing list