Attachment #6818 for bug #38232

View | Details | Raw Unified | Return to bug 38232
Collapse All | Expand All




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Uniention Samba4 Connector"
NAME="univention-s4-connector"
DAEMON="/usr/sbin/$NAME"
DAEMON_ARGS=
PIDFILE="/var/run/$NAME"
SCRIPTNAME="/etc/init.d/$NAME"

test -x "$DAEMON" || exit 0

. /lib/init/vars.sh
. /lib/lsb/init-functions

do_start () {
	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --startas "$DAEMON" --test > /dev/null ||
		return 1
	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --startas "$DAEMON" -- $DAEMON_ARGS ||
		return 2
}

do_stop () {
	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile "$PIDFILE"
	RETVAL="$?"
	[ "$RETVAL" = 2 ] && return 2
	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --name "main.py"
	[ "$?" = 2 ] && return 2
	rm -f "$PIDFILE"
	return "$RETVAL"
}

case "$1" in
	start)
		# check ucr autostart setting
		if [ -f "/usr/share/univention-config-registry/init-autostart.lib" ]; then
			. "/usr/share/univention-config-registry/init-autostart.lib"
			check_autostart s4-connector connector/s4/autostart
		fi	
		log_action_msg "Starting univention-s4-connector daemon"
		if start-stop-daemon --start --quiet --pidfile "$S4CONNECTORPID" -a /usr/sbin/univention-s4-connector; then
			log_action_end_msg 0
		else
			log_action_end_msg 1
		fi
		[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
		do_start
		case "$?" in
			0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
			2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
		esac
		;;
	stop)
		[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
		do_stop
		case "$?" in
			0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
			2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
		esac
		;;
	status)
		status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
		;;
	restart|force-reload)
		log_daemon_msg "Restarting $DESC" "$NAME"
		do_stop
		case "$?" in
			0|1)
				sleep 2 # give it some time to die
				do_start
				case "$?" in
					0) log_end_msg 0 ;;
					1) log_end_msg 1 ;; # Old process is still running
					*) log_end_msg 1 ;; # Failed to start
				esac
				;;
			*)
				# Failed to stop
				log_end_msg 1
				;;
		esac
		;;
	crestart)
		pidofproc -p "$PIDFILE" "$daemon" >/dev/null && "$SCRIPTNAME" restart
		if [ -n "$S4CONNECTOR" ]; then
		    ps xaw | grep connector | grep -q "$S4CONNECTOR" && $0 restart
		fi
		;;
	*)
		echo "Usage: $SCRIPTNAME {start|stop|status|restart|crestart|force-reload}"
		exit 3
		;;
esac

:

(-)a/branches/ucs-4.0/ucs-4.0-1/services/univention-s4-connector/modules/univention/s4connector/s4/main.py (-17 / +15 lines)

Lines 30-42	Link Here

# License with the Debian GNU/Linux or Univention distribution in file

# License with the Debian GNU/Linux or Univention distribution in file

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

from warnings import filterwarnings

filterwarnings("ignore")

import sys

import sys, string, os, time, signal, shutil

import os

import time

import signal

from optparse import OptionParser

from optparse import OptionParser

import fcntl

import fcntl

import ldap, traceback

import ldap

import traceback

import univention

import univention

import univention.s4connector

import univention.s4connector

import univention.s4connector.s4

import univention.s4connector.s4

Lines 55-64 if options.configbasename:	Link Here

	CONFIGBASENAME = options.configbasename

	CONFIGBASENAME = options.configbasename

STATUSLOGFILE = "/var/log/univention/%s-s4-status.log" % CONFIGBASENAME

STATUSLOGFILE = "/var/log/univention/%s-s4-status.log" % CONFIGBASENAME

sys.path=['/etc/univention/%s/s4/' % CONFIGBASENAME]+sys.path

from imp import load_source

mapping = load_source('mapping', '/etc/univention/%s/s4/mapping.py' % CONFIGBASENAME)

import mapping

def daemon(lock_file):

def daemon(lock_file):

Lines 146-152 def connect():	Link Here

146

			s4_ldap_bindpw=s4_ldap_bindpw[0:-1]

149

			s4_ldap_bindpw=s4_ldap_bindpw[0:-1]

147

	else:

150

	else:

148

		s4_ldap_bindpw=None

151

		s4_ldap_bindpw=None

149

152

150

	poll_sleep=int(baseConfig['%s/s4/poll/sleep' % CONFIGBASENAME])

153

	poll_sleep=int(baseConfig['%s/s4/poll/sleep' % CONFIGBASENAME])

151

	s4_init=None

154

	s4_init=None

152

	while not s4_init:

155

	while not s4_init:

Lines 166-172 def connect():	Link Here

166

			print "Warning: Can't initialize LDAP-Connections, wait..."

169

			print "Warning: Can't initialize LDAP-Connections, wait..."

167

			sys.stdout.flush()

170

			sys.stdout.flush()

168

			time.sleep(poll_sleep)

171

			time.sleep(poll_sleep)

169

			pass

170

172

171

173

172

	# Initialisierung auf UCS und S4 Seite durchfuehren

174

	# Initialisierung auf UCS und S4 Seite durchfuehren

Lines 179-190 def connect():	Link Here

179

			ucs_init=True

181

			ucs_init=True

180

		except ldap.SERVER_DOWN:

182

		except ldap.SERVER_DOWN:

181

			print "Can't contact LDAP server during ucs-poll, sync not possible."

183

			print "Can't contact LDAP server during ucs-poll, sync not possible."

182

 			sys.stdout.flush()

184

			sys.stdout.flush()

183

			time.sleep(poll_sleep)

185

			time.sleep(poll_sleep)

184

			s4.open_s4()

186

			s4.open_s4()

185

			s4.open_ucs()

187

			s4.open_ucs()

186

			pass

187

188

189

	while not s4_init:

189

	while not s4_init:

190

		try:

190

		try:

Lines 192-202 def connect():	Link Here

192

			s4_init=True

192

			s4_init=True

193

		except ldap.SERVER_DOWN:

193

		except ldap.SERVER_DOWN:

194

			print "Can't contact LDAP server during ucs-poll, sync not possible."

194

			print "Can't contact LDAP server during ucs-poll, sync not possible."

195

 			sys.stdout.flush()

195

			sys.stdout.flush()

196

			time.sleep(poll_sleep)

196

			time.sleep(poll_sleep)

197

			s4.open_s4()

197

			s4.open_s4()

198

			s4.open_ucs()

198

			s4.open_ucs()

199

			pass

200

199

201

	f.close()

200

	f.close()

202

	retry_rejected=0

201

	retry_rejected=0

Lines 250-256 def connect():	Link Here

250

		except ldap.SERVER_DOWN:

249

		except ldap.SERVER_DOWN:

251

			print "Can't contact LDAP server during resync rejected, sync not possible."

250

			print "Can't contact LDAP server during resync rejected, sync not possible."

252

			connected = False

251

			connected = False

253

 			sys.stdout.flush()

252

			sys.stdout.flush()

254

			change_counter=0

253

			change_counter=0

255

			retry_rejected+=1

254

			retry_rejected+=1

256

255

Lines 285-291 def main():	Link Here

285

			f=open(STATUSLOGFILE, 'w+')

284

			f=open(STATUSLOGFILE, 'w+')

286

			sys.stdout=f

285

			sys.stdout=f

287

			print time.ctime()

286

			print time.ctime()

288

287

289

			text = ''

288

			text = ''

290

			exc_info = sys.exc_info()

289

			exc_info = sys.exc_info()

291

			lines = apply(traceback.format_exception, exc_info)

290

			lines = apply(traceback.format_exception, exc_info)

Lines 304-307 def main():	Link Here

304

303

305

if __name__ == "__main__":

304

if __name__ == "__main__":

306

	main()

305

	main()

307

(-)a/branches/ucs-4.0/ucs-4.0-1/services/univention-s4-connector/univention-s4-connector (-4 / +3 lines)

Lines 32-38	Link Here

# before starting the ad connector, generate the mapping file

# before starting the ad connector, generate the mapping file

cat /etc/univention/connector/s4/mapping | univention-config-registry filter --encode-utf8 >/etc/univention/connector/s4/mapping.py

univention-config-registry filter --encode-utf8 </etc/univention/connector/s4/mapping >/etc/univention/connector/s4/mapping.py

/usr/bin/python2.7 -W ignore /usr/lib/pymodules/python2.7/univention/s4connector/s4/main.py

exec /usr/lib/pymodules/python2.7/univention/s4connector/s4/main.py

exec python2.7 -m univention.s4connector.s4.main

Return to bug 38232