[Pkg-samba-maint] r832 - branches/samba4
Steinar H. Gunderson
sesse at costa.debian.org
Tue Jan 3 13:39:52 UTC 2006
Author: sesse
Date: 2006-01-03 13:39:52 +0000 (Tue, 03 Jan 2006)
New Revision: 832
Added:
branches/samba4/samba.config
branches/samba4/samba.install
branches/samba4/samba.postinst
branches/samba4/samba.samba.init
branches/samba4/samba.templates
Removed:
branches/samba4/samba-server.config
branches/samba4/samba-server.install
branches/samba4/samba-server.postinst
branches/samba4/samba-server.samba.init
branches/samba4/samba-server.templates
Modified:
branches/samba4/changelog
branches/samba4/control
Log:
Rename samba-server package to just samba, for consistency with the
Samba 3 packaging.
Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/changelog 2006-01-03 13:39:52 UTC (rev 832)
@@ -2,8 +2,10 @@
* First upload to Debian main.
* Remove a few unused files in the packaging.
+ * Rename samba-server package to just samba, for consistency with the
+ Samba 3 packaging.
- -- Steinar H. Gunderson <sesse at debian.org> Tue, 3 Jan 2006 14:19:43 +0100
+ -- Steinar H. Gunderson <sesse at debian.org> Tue, 3 Jan 2006 14:37:59 +0100
samba (3.9.0+SVN12395-1) unstable; urgency=low
Modified: branches/samba4/control
===================================================================
--- branches/samba4/control 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/control 2006-01-03 13:39:52 UTC (rev 832)
@@ -19,8 +19,8 @@
regard to upgrades between versions.
.
This package contains the common files that are used by both the server
- (provided in the samba-server package) and the client (provided in the
- samba-client package).
+ (provided in the samba package) and the client (provided in the samba-client
+ package).
Package: samba-client
Architecture: any
@@ -57,7 +57,7 @@
This package contains programs for testing the reliability and speed
of SMB servers, Samba in particular.
-Package: samba-server
+Package: samba
Architecture: any
Recommends: samba-swat
Depends: ${shlibs:Depends}, samba-common, debconf
Deleted: branches/samba4/samba-server.config
===================================================================
--- branches/samba4/samba-server.config 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/samba-server.config 2006-01-03 13:39:52 UTC (rev 832)
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_title "Samba Server"
-
-db_input medium samba4-server/setup-pdc || true
-db_go || true
-
-db_get samba4-server/setup-pdc
-
-if [ "$RET" = "true" ]; then
- db_input medium samba4-server/realm || true
- db_go || true
-
- db_input medium samba4-server/domain || true
- db_go || true
-
- db_input medium samba4-server/password || true
- db_go || true
-
- db_input medium samba4-server/done || true
- db_go || true
-fi
-
Deleted: branches/samba4/samba-server.install
===================================================================
--- branches/samba4/samba-server.install 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/samba-server.install 2006-01-03 13:39:52 UTC (rev 832)
@@ -1,3 +0,0 @@
-usr/sbin/smbd
-usr/bin/smbstatus
-usr/bin/smbscript
Deleted: branches/samba4/samba-server.postinst
===================================================================
--- branches/samba4/samba-server.postinst 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/samba-server.postinst 2006-01-03 13:39:52 UTC (rev 832)
@@ -1,28 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_get samba-server/setup-pdc || true
-
-if [ "$RET" = "true" ]; then
- db_get samba-server/realm
- REALM="$RET"
-
- db_get samba-server/domain
- DOMAIN="$RET"
-
- db_get samba-server/password
- PASSWORD="$RET"
-
- db_stop
-
- /usr/lib/samba/setup/provision --realm="$REALM" --domain="$DOMAIN" --adminpass="$PASSWORD"
-else
- db_stop
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: branches/samba4/samba-server.samba.init
===================================================================
--- branches/samba4/samba-server.samba.init 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/samba-server.samba.init 2006-01-03 13:39:52 UTC (rev 832)
@@ -1,63 +0,0 @@
-#! /bin/sh
-
-#
-# Start/stops the Samba daemon (smbd).
-# Adapted from the Samba 3 packages.
-#
-
-SMBDPID=/var/run/samba/smbd.pid
-
-# clear conflicting settings from the environment
-unset TMPDIR
-
-# See if the daemon and the config file are there
-test -x /usr/sbin/smbd -a -r /etc/samba/smb.conf || exit 0
-
-. /lib/lsb/init-functions
-
-case "$1" in
- start)
- log_daemon_msg "Starting Samba 4 daemon" "smbd"
-
- if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then
- log_end_msg 1
- exit 1
- fi
-
- log_end_msg 0
- ;;
- stop)
- log_daemon_msg "Stopping Samba 4 daemon" "smbd"
-
- start-stop-daemon --stop --quiet --pidfile $SMBDPID
- # Wait a little and remove stale PID file
- sleep 1
- if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null
- then
- # Stale PID file (smbd was succesfully stopped),
- # remove it (should be removed by smbd itself IMHO.)
- rm -f $SMBDPID
- fi
-
- log_end_msg 0
-
- ;;
- reload)
- log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
-
- start-stop-daemon --stop --signal HUP --pidfile $SMBDPID
-
- log_end_msg 0
- ;;
- restart|force-reload)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
- exit 1
- ;;
-esac
-
-exit 0
Deleted: branches/samba4/samba-server.templates
===================================================================
--- branches/samba4/samba-server.templates 2006-01-03 13:25:24 UTC (rev 831)
+++ branches/samba4/samba-server.templates 2006-01-03 13:39:52 UTC (rev 832)
@@ -1,32 +0,0 @@
-Template: samba-server/setup-pdc
-Type: boolean
-Default: false
-_Description: Set up Samba 4 as a PDC?
- Do you want to set up Samba 4 as an Active Directory PDC? If you answer
- "no", Samba will be left unconfigured, and you will have to provision and
- make configuration files by hand.
- .
- Note that even if you answer "yes", you will need to set up DNS such that
- it serves the data from the zone file in that directory before you can use
- your Active Directory domain.
-
-Template: samba-server/realm
-Type: string
-_Description: Realm
- What Kerberos realm will your server be in? In many cases, this will be
- the same as your DNS domain name (ie. YOUR.REALM).
-
-Template: samba-server/domain
-Type: string
-_Description: Domain
- What will be the domain of your server? This is also known as the
- "workgroup" of your server, and is typically a short name without any dots
- (ie. DOMAIN).
-
-Template: samba-server/password
-Type: password
-_Description: Administrator password
- You will need a password for the "Administrator" account. Note that in the
- current version of the packaging, this will be visible in "ps" for a short
- time for everybody on the system, so you might not want to use a very
- sensitive password here.
Copied: branches/samba4/samba.config (from rev 827, branches/samba4/samba-server.config)
Copied: branches/samba4/samba.install (from rev 827, branches/samba4/samba-server.install)
Copied: branches/samba4/samba.postinst (from rev 827, branches/samba4/samba-server.postinst)
===================================================================
--- branches/samba4/samba-server.postinst 2006-01-03 12:58:20 UTC (rev 827)
+++ branches/samba4/samba.postinst 2006-01-03 13:39:52 UTC (rev 832)
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_get samba/setup-pdc || true
+
+if [ "$RET" = "true" ]; then
+ db_get samba/realm
+ REALM="$RET"
+
+ db_get samba/domain
+ DOMAIN="$RET"
+
+ db_get samba/password
+ PASSWORD="$RET"
+
+ db_stop
+
+ /usr/lib/samba/setup/provision --realm="$REALM" --domain="$DOMAIN" --adminpass="$PASSWORD"
+else
+ db_stop
+fi
+
+#DEBHELPER#
+
+exit 0
Copied: branches/samba4/samba.samba.init (from rev 827, branches/samba4/samba-server.samba.init)
Copied: branches/samba4/samba.templates (from rev 827, branches/samba4/samba-server.templates)
===================================================================
--- branches/samba4/samba-server.templates 2006-01-03 12:58:20 UTC (rev 827)
+++ branches/samba4/samba.templates 2006-01-03 13:39:52 UTC (rev 832)
@@ -0,0 +1,32 @@
+Template: samba/setup-pdc
+Type: boolean
+Default: false
+_Description: Set up Samba 4 as a PDC?
+ Do you want to set up Samba 4 as an Active Directory PDC? If you answer
+ "no", Samba will be left unconfigured, and you will have to provision and
+ make configuration files by hand.
+ .
+ Note that even if you answer "yes", you will need to set up DNS such that
+ it serves the data from the zone file in that directory before you can use
+ your Active Directory domain.
+
+Template: samba/realm
+Type: string
+_Description: Realm
+ What Kerberos realm will your server be in? In many cases, this will be
+ the same as your DNS domain name (ie. YOUR.REALM).
+
+Template: samba/domain
+Type: string
+_Description: Domain
+ What will be the domain of your server? This is also known as the
+ "workgroup" of your server, and is typically a short name without any dots
+ (ie. DOMAIN).
+
+Template: samba/password
+Type: password
+_Description: Administrator password
+ You will need a password for the "Administrator" account. Note that in the
+ current version of the packaging, this will be visible in "ps" for a short
+ time for everybody on the system, so you might not want to use a very
+ sensitive password here.
More information about the Pkg-samba-maint
mailing list