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

(-)a/branches/ucs-3.0/ucs/base/univention-debmirror/debian/postinst (-1 / +1 lines)
 Lines 44-49   fi Link Here 
44
call_joinscript 77univention-debmirror.inst
44
call_joinscript 77univention-debmirror.inst
45
45
46
a2ensite univention-repository
46
a2ensite univention-repository
47
/etc/init.d/apache2 reload || true
47
invoke-rc.d apache2 reload || true
48
48
49
exit 0
49
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc (-2 / +2 lines)
 Lines 119-127   case "$1" in Link Here 
119
	#	option to the "reload" entry above. If not, "force-reload" is
119
	#	option to the "reload" entry above. If not, "force-reload" is
120
	#	just the same as "restart".
120
	#	just the same as "restart".
121
	#
121
	#
122
	/etc/init.d/heimdal-kdc stop
122
	invoke-rc.d heimdal-kdc stop
123
	sleep 1
123
	sleep 1
124
	/etc/init.d/heimdal-kdc start
124
	invoke-rc.d heimdal-kdc start
125
	;;
125
	;;
126
  *)
126
  *)
127
	N=/etc/init.d/$NAME
127
	N=/etc/init.d/$NAME
(-)a/branches/ucs-3.0/ucs/base/univention-heimdal/debian/univention-heimdal-kdc.postinst (-2 / +2 lines)
 Lines 65-71   for fn in kdc.conf kadmind.acl ; do Link Here 
65
done
65
done
66
66
67
if [ "$1" = "configure" -a -n "$2" ]; then
67
if [ "$1" = "configure" -a -n "$2" ]; then
68
	/etc/init.d/heimdal-kdc restart
68
	invoke-rc.d heimdal-kdc restart
69
fi
69
fi
70
70
71
univention-config-registry set kerberos/password/quality/check?yes
71
univention-config-registry set kerberos/password/quality/check?yes
 Lines 84-90   fi Link Here 
84
if [ "$1" = "configure" ]; then
84
if [ "$1" = "configure" ]; then
85
	if test -f /etc/init.d/univention-directory-listener
85
	if test -f /etc/init.d/univention-directory-listener
86
		then
86
		then
87
		/etc/init.d/univention-directory-listener crestart
87
		invoke-rc.d univention-directory-listener crestart
88
	fi
88
	fi
89
fi
89
fi
90
90
(-)a/branches/ucs-3.0/ucs/base/univention-installer/scripts/28_postconfigure_config_registry.sh (-1 / +1 lines)
 Lines 295-301   univention-config-registry set version/patchlevel=$version_patchlevel Link Here 
295
univention-config-registry commit
295
univention-config-registry commit
296
296
297
# Start syslogd
297
# Start syslogd
298
/etc/init.d/sysklogd start
298
invoke-rc.d sysklogd start
299
299
300
300
301
__EOT__
301
__EOT__
(-)a/branches/ucs-3.0/ucs/base/univention-installer/scripts/90_cleanup.sh (-1 / +1 lines)
 Lines 59-65   chroot /instmnt ./tmp/cleanup.sh Link Here 
59
59
60
cat >/instmnt/tmp/cleanup.sh <<__EOT__
60
cat >/instmnt/tmp/cleanup.sh <<__EOT__
61
if [ -x /etc/init.d/nscd ]; then
61
if [ -x /etc/init.d/nscd ]; then
62
	/etc/init.d/nscd stop
62
	invoke-rc.d nscd stop
63
fi
63
fi
64
64
65
umount -a >/dev/null 2>&1
65
umount -a >/dev/null 2>&1
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-manager.postinst (-1 / +1 lines)
 Lines 50-56   univention-config-registry set dhclient/options/timeout?"40" Link Here 
50
univention-config-registry set dhclient/options/retry?"60"
50
univention-config-registry set dhclient/options/retry?"60"
51
51
52
# need to reload dbus to read new permissions for networkmanager/group
52
# need to reload dbus to read new permissions for networkmanager/group
53
/etc/init.d/dbus reload
53
invoke-rc.d dbus reload
54
54
55
for i in $(seq 0 10); do
55
for i in $(seq 0 10); do
56
	var="interfaces_eth${i}_ifplugd"
56
	var="interfaces_eth${i}_ifplugd"
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/00_rdate (-1 / +1 lines)
 Lines 33-38    Link Here 
33
33
34
[ ! -f /var/run/ntpd.pid ] && exit 0
34
[ ! -f /var/run/ntpd.pid ] && exit 0
35
35
36
/etc/init.d/ntp stop
36
invoke-rc.d ntp stop
37
37
38
exit 0
38
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/15_nscd (-1 / +1 lines)
 Lines 33-39    Link Here 
33
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
33
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
34
34
35
if [ -x /etc/init.d/nscd ]; then
35
if [ -x /etc/init.d/nscd ]; then
36
	/etc/init.d/nscd restart
36
	invoke-rc.d nscd restart
37
	nscd -i passwd
37
	nscd -i passwd
38
	nscd -i group
38
	nscd -i group
39
fi
39
fi
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/50_gdm (-2 / +2 lines)
 Lines 32-38    Link Here 
32
# <http://www.gnu.org/licenses/>.
32
# <http://www.gnu.org/licenses/>.
33
33
34
if [ -x /etc/init.d/gdm ]; then
34
if [ -x /etc/init.d/gdm ]; then
35
	/etc/init.d/gdm reload
35
	invoke-rc.d gdm reload
36
fi
36
fi
37
37
38
exit 0
38
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/05_rdate (-2 / +2 lines)
 Lines 36-43   ucs_ignore_interface Link Here 
36
36
37
[ ! -f /var/run/ntpd.pid ] && exit 0
37
[ ! -f /var/run/ntpd.pid ] && exit 0
38
38
39
/etc/init.d/rdate start
39
invoke-rc.d rdate start
40
40
41
/etc/init.d/ntp start
41
invoke-rc.d ntp start
42
42
43
exit 0
43
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/15_nscd (-1 / +1 lines)
 Lines 36-42   ucs_ignore_interface Link Here 
36
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
36
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
37
37
38
if [ -x /etc/init.d/nscd ]; then
38
if [ -x /etc/init.d/nscd ]; then
39
	/etc/init.d/nscd restart
39
	invoke-rc.d nscd restart
40
	nscd -i passwd
40
	nscd -i passwd
41
	nscd -i group
41
	nscd -i group
42
fi
42
fi
(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/50_gdm (-1 / +1 lines)
 Lines 61-67   fi Link Here 
61
61
62
if [ -x /etc/init.d/gdm ]; then
62
if [ -x /etc/init.d/gdm ]; then
63
	if [ "$reload" = "true" ]; then
63
	if [ "$reload" = "true" ]; then
64
		/etc/init.d/gdm reload
64
		invoke-rc.d gdm reload
65
	fi
65
	fi
66
fi
66
fi
67
67
(-)a/branches/ucs-3.0/ucs/base/univention-pam/debian/univention-pam.postinst (-1 / +1 lines)
 Lines 122-128   if [ -e /etc/univention/templates/files/etc/pam.d/common-auth ]; then Link Here 
122
fi
122
fi
123
123
124
if [ -x "/etc/init.d/univention-directory-listener" ] ; then
124
if [ -x "/etc/init.d/univention-directory-listener" ] ; then
125
	/etc/init.d/univention-directory-listener crestart
125
	invoke-rc.d univention-directory-listener crestart
126
fi
126
fi
127
127
128
if [ "$1" = configure ]
128
if [ "$1" = configure ]
(-)a/branches/ucs-3.0/ucs/base/univention-pam/univention-nscd (-1 / +1 lines)
 Lines 32-37    Link Here 
32
32
33
if [ "$1" = "postchange" ] ; then
33
if [ "$1" = "postchange" ] ; then
34
	if [ -x /etc/init.d/nscd ]; then
34
	if [ -x /etc/init.d/nscd ]; then
35
		/etc/init.d/nscd restart
35
		invoke-rc.d nscd restart
36
	fi
36
	fi
37
fi
37
fi
(-)a/branches/ucs-3.0/ucs/base/univention-passwd-cache/debian/libpam-passwdcache.postinst (-1 / +1 lines)
 Lines 38-44   if [ -e /etc/univention/passwdcache/shadow ]; then Link Here 
38
fi
38
fi
39
39
40
if [ -x /etc/init.d/univention-directory-listener ]; then
40
if [ -x /etc/init.d/univention-directory-listener ]; then
41
	/etc/init.d/univention-directory-listener crestart
41
	invoke-rc.d univention-directory-listener crestart
42
fi
42
fi
43
43
44
exit 0
44
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-quota/test/quotatest (-2 / +2 lines)
 Lines 266-272   setup() { Link Here 
266
			warn "could not mount $fs with quota, skipping"
266
			warn "could not mount $fs with quota, skipping"
267
		fi
267
		fi
268
	done
268
	done
269
	/etc/init.d/quota restart &> /dev/null
269
	invoke-rc.d quota restart &> /dev/null
270
	debug "waiting for nfs (60 sec)..."
270
	debug "waiting for nfs (60 sec)..."
271
	sleep 60
271
	sleep 60
272
}
272
}
 Lines 275-281   resetup() { Link Here 
275
	debug "setting policy reference for share container..."
275
	debug "setting policy reference for share container..."
276
	univention-directory-manager container/cn modify --dn="cn=quotatest,cn=shares,$ldap_base" \
276
	univention-directory-manager container/cn modify --dn="cn=quotatest,cn=shares,$ldap_base" \
277
		--policy-reference="cn=quota_test,cn=userquota,cn=shares,cn=policies,$ldap_base" &>/dev/null
277
		--policy-reference="cn=quota_test,cn=userquota,cn=shares,cn=policies,$ldap_base" &>/dev/null
278
	/etc/init.d/quota restart &> /dev/null
278
	invoke-rc.d quota restart &> /dev/null
279
	debug "waiting for nfs (60 sec)..."
279
	debug "waiting for nfs (60 sec)..."
280
	sleep 60
280
	sleep 60
281
281
(-)a/branches/ucs-3.0/ucs/base/univention-runit/debian/univention-runit.postinst (-1 / +1 lines)
 Lines 49-55   fi Link Here 
49
49
50
if [ -z "$2" ]; then
50
if [ -z "$2" ]; then
51
	# only start the daemon during the installation
51
	# only start the daemon during the installation
52
	/etc/init.d/univention-runit start
52
	invoke-rc.d univention-runit start
53
fi
53
fi
54
54
55
exit 0
55
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst (-1 / +1 lines)
 Lines 106-112   fi Link Here 
106
if [ "$1" = "configure" ]; then
106
if [ "$1" = "configure" ]; then
107
	if test -f /etc/init.d/univention-directory-listener
107
	if test -f /etc/init.d/univention-directory-listener
108
		then
108
		then
109
		/etc/init.d/univention-directory-listener crestart || true
109
		invoke-rc.d univention-directory-listener crestart || true
110
	fi
110
	fi
111
fi
111
fi
112
112
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/debian/univention-system-setup-appliance.init (-1 / +1 lines)
 Lines 40-46   case "$1" in Link Here 
40
		if [ -n "$system_setup_appliance_start" ] && [ "$system_setup_appliance_start" = "yes" ] || [ "$system_setup_appliance_start" = "true" ]; then
40
		if [ -n "$system_setup_appliance_start" ] && [ "$system_setup_appliance_start" = "yes" ] || [ "$system_setup_appliance_start" = "true" ]; then
41
			run-parts /usr/lib/univention-system-setup/appliance-hooks.d/
41
			run-parts /usr/lib/univention-system-setup/appliance-hooks.d/
42
			univention-config-registry set system/setup/appliance/start=false
42
			univention-config-registry set system/setup/appliance/start=false
43
			test -x /etc/init.d/gdm && /etc/init.d/gdm start
43
			test -x /etc/init.d/gdm && invoke-rc.d gdm start
44
		fi
44
		fi
45
		log_action_end_msg 0
45
		log_action_end_msg 0
46
		;;
46
		;;
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/10hostname (-1 / +1 lines)
 Lines 470-476   if [ -x "/usr/bin/newaliases" ]; then Link Here 
470
fi
470
fi
471
471
472
if [ -x "/etc/init.d/postfix" ]; then
472
if [ -x "/etc/init.d/postfix" ]; then
473
	/etc/init.d/postfix reload
473
	invoke-rc.d postfix reload
474
fi
474
fi
475
475
476
eval "$(univention-config-registry shell samba/user ldap/hostdn)"
476
eval "$(univention-config-registry shell samba/user ldap/hostdn)"
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/12domainname (-2 / +2 lines)
 Lines 344-350   service_stop slapd Link Here 
344
service_start slapd nscd heimdal-kdc
344
service_start slapd nscd heimdal-kdc
345
345
346
if [ -x "/etc/init.d/slapd" ]; then
346
if [ -x "/etc/init.d/slapd" ]; then
347
	/etc/init.d/slapd restart
347
	invoke-rc.d slapd restart
348
fi
348
fi
349
349
350
if [ "$ldap_available" = 1 ]; then
350
if [ "$ldap_available" = 1 ]; then
 Lines 593-599   if [ -x "/usr/bin/newaliases" ]; then Link Here 
593
fi
593
fi
594
594
595
if [ -x "/etc/init.d/postfix" ]; then
595
if [ -x "/etc/init.d/postfix" ]; then
596
	/etc/init.d/postfix reload
596
	invoke-rc.d postfix reload
597
fi
597
fi
598
598
599
# stop the dns server and remove the cache
599
# stop the dns server and remove the cache
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/language/11default_locale (-1 / +1 lines)
 Lines 58-64   else Link Here 
58
	if [ -e "/var/www/$new_site" ]; then
58
	if [ -e "/var/www/$new_site" ]; then
59
		univention-config-registry set apache2/startsite="$new_site"
59
		univention-config-registry set apache2/startsite="$new_site"
60
		if [ -x /etc/init.d/apache2 ]; then
60
		if [ -x /etc/init.d/apache2 ]; then
61
			/etc/init.d/apache2 reload
61
			invoke-rc.d apache2 reload
62
		fi
62
		fi
63
	fi
63
	fi
64
64
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/net/10interfaces (-3 / +3 lines)
 Lines 488-494   if [ -n "$baseconfig_set" -o -n "$baseconfig_unset" ]; then Link Here 
488
	# shutdown ifplugd due to changed dhcp settings if neccessary
488
	# shutdown ifplugd due to changed dhcp settings if neccessary
489
	if [ "$restart_ifplugd" = 1 ] ; then
489
	if [ "$restart_ifplugd" = 1 ] ; then
490
		if [ -x "/etc/init.d/ifplugd" ] ; then
490
		if [ -x "/etc/init.d/ifplugd" ] ; then
491
			/etc/init.d/ifplugd stop
491
			invoke-rc.d ifplugd stop
492
		fi
492
		fi
493
	fi
493
	fi
494
494
 Lines 521-527   if [ -n "$baseconfig_set" -o -n "$baseconfig_unset" ]; then Link Here 
521
	# restart ifplugd due to changed dhcp settings if neccessary
521
	# restart ifplugd due to changed dhcp settings if neccessary
522
	if [ "$restart_ifplugd" = 1 ] ; then
522
	if [ "$restart_ifplugd" = 1 ] ; then
523
		if [ -x "/etc/init.d/ifplugd" ] ; then
523
		if [ -x "/etc/init.d/ifplugd" ] ; then
524
			/etc/init.d/ifplugd start
524
			invoke-rc.d ifplugd start
525
		fi
525
		fi
526
	fi
526
	fi
527
527
 Lines 553-559   if [ -n "$baseconfig_set" -o -n "$baseconfig_unset" ]; then Link Here 
553
		for i in `pidof nmbd`; do
553
		for i in `pidof nmbd`; do
554
			/bin/kill -9 $i
554
			/bin/kill -9 $i
555
		done
555
		done
556
		/etc/init.d/samba restart
556
		invoke-rc.d samba restart
557
	fi
557
	fi
558
558
559
fi
559
fi
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/security/10security (-1 / +1 lines)
 Lines 150-156   fi Link Here 
150
150
151
echo `date` : "Restarting univention-iptables "  >> /var/log/univention/setup.log
151
echo `date` : "Restarting univention-iptables "  >> /var/log/univention/setup.log
152
152
153
/etc/init.d/univention-iptables restart >> /var/log/univention/setup.log
153
invoke-rc.d univention-iptables restart >> /var/log/univention/setup.log
154
154
155
exit 0
155
exit 0
156
156
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/setup_utils.sh (-2 / +2 lines)
 Lines 83-89   service_stop () Link Here 
83
{
83
{
84
	for service in $@; do
84
	for service in $@; do
85
		if [ -x /etc/init.d/$service ]; then
85
		if [ -x /etc/init.d/$service ]; then
86
			/etc/init.d/$service stop
86
			invoke-rc.d $service stop
87
		fi
87
		fi
88
	done
88
	done
89
}
89
}
 Lines 91-97   service_start () Link Here 
91
{
91
{
92
	for service in $@; do
92
	for service in $@; do
93
		if [ -x /etc/init.d/$service ]; then
93
		if [ -x /etc/init.d/$service ]; then
94
			/etc/init.d/$service start
94
			invoke-rc.d $service start
95
		fi
95
		fi
96
	done
96
	done
97
}
97
}
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/timezone/10timezone (-3 / +3 lines)
 Lines 53-60   fi Link Here 
53
echo "$timezone" >/etc/timezone
53
echo "$timezone" >/etc/timezone
54
ln -sf /usr/share/zoneinfo/$timezone /etc/localtime
54
ln -sf /usr/share/zoneinfo/$timezone /etc/localtime
55
55
56
test -x /etc/init.d/ntp-server && /etc/init.d/ntp-server stop
56
test -x /etc/init.d/ntp-server && invoke-rc.d ntp-server stop
57
test -x /etc/init.d/ntpdate && /etc/init.d/ntpdate restart
57
test -x /etc/init.d/ntpdate && invoke-rc.d ntpdate restart
58
test -x /etc/init.d/ntp-server && /etc/init.d/ntp-server start
58
test -x /etc/init.d/ntp-server && invoke-rc.d ntp-server start
59
59
60
exit 0
60
exit 0
(-)a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/share/univention-system-setup/startxwithfirefox (-1 / +1 lines)
 Lines 46-52   then # call self in xinit as nobody, then start gdm Link Here 
46
		/usr/share/univention-system-setup/univention-system-setup --modules="password,net" < /dev/tty1 > /dev/tty1
46
		/usr/share/univention-system-setup/univention-system-setup --modules="password,net" < /dev/tty1 > /dev/tty1
47
	fi
47
	fi
48
	if [ -x /etc/init.d/gdm ] ; then
48
	if [ -x /etc/init.d/gdm ] ; then
49
		/etc/init.d/gdm start
49
		invoke-rc.d gdm start
50
	fi
50
	fi
51
	exit
51
	exit
52
fi
52
fi
(-)a/branches/ucs-3.0/ucs/base/univention-updater/script/set-apache-permissions (-2 / +2 lines)
 Lines 33-45    Link Here 
33
if [ -e /usr/sbin/apache2 ] && [ ! -x /usr/sbin/apache2 ]; then
33
if [ -e /usr/sbin/apache2 ] && [ ! -x /usr/sbin/apache2 ]; then
34
	/usr/sbin/dpkg-statoverride --remove /usr/sbin/apache2 >/dev/null 2>&1
34
	/usr/sbin/dpkg-statoverride --remove /usr/sbin/apache2 >/dev/null 2>&1
35
	chmod +x /usr/sbin/apache2
35
	chmod +x /usr/sbin/apache2
36
	/etc/init.d/apache2 restart >/dev/null 2>&1
36
	invoke-rc.d apache2 restart >/dev/null 2>&1
37
fi
37
fi
38
38
39
if [ -e /usr/sbin/univention-management-console-server ] && [ ! -x /usr/sbin/univention-management-console-server ]; then
39
if [ -e /usr/sbin/univention-management-console-server ] && [ ! -x /usr/sbin/univention-management-console-server ]; then
40
	/usr/sbin/dpkg-statoverride --remove /usr/sbin/univention-management-console-server >/dev/null 2>&1
40
	/usr/sbin/dpkg-statoverride --remove /usr/sbin/univention-management-console-server >/dev/null 2>&1
41
	chmod +x /usr/sbin/univention-management-console-server
41
	chmod +x /usr/sbin/univention-management-console-server
42
	/etc/init.d/univention-management-console-server restart >/dev/null 2>&1
42
	invoke-rc.d univention-management-console-server restart >/dev/null 2>&1
43
fi
43
fi
44
44
45
exit 0
45
exit 0
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/debian/univention-network-manager.postinst (-1 / +1 lines)
 Lines 50-56   univention-config-registry set dhclient/options/timeout?"40" Link Here 
50
univention-config-registry set dhclient/options/retry?"60"
50
univention-config-registry set dhclient/options/retry?"60"
51
51
52
# need to reload dbus to read new permissions for networkmanager/group
52
# need to reload dbus to read new permissions for networkmanager/group
53
/etc/init.d/dbus reload
53
invoke-rc.d dbus reload
54
54
55
for i in $(seq 0 4); do
55
for i in $(seq 0 4); do
56
	var="interfaces_eth${i}_ifplugd"
56
	var="interfaces_eth${i}_ifplugd"
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/00_rdate (-1 / +1 lines)
 Lines 33-38    Link Here 
33
33
34
[ ! -f /var/run/ntpd.pid ] && exit 0
34
[ ! -f /var/run/ntpd.pid ] && exit 0
35
35
36
/etc/init.d/ntp stop
36
invoke-rc.d ntp stop
37
37
38
exit 0
38
exit 0
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/15_nscd (-1 / +1 lines)
 Lines 33-39    Link Here 
33
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
33
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
34
34
35
if [ -x /etc/init.d/nscd ]; then
35
if [ -x /etc/init.d/nscd ]; then
36
	/etc/init.d/nscd restart
36
	invoke-rc.d nscd restart
37
	nscd -i passwd
37
	nscd -i passwd
38
	nscd -i group
38
	nscd -i group
39
fi
39
fi
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/50_gdm (-2 / +2 lines)
 Lines 32-38    Link Here 
32
# <http://www.gnu.org/licenses/>.
32
# <http://www.gnu.org/licenses/>.
33
33
34
if [ -x /etc/init.d/gdm ]; then
34
if [ -x /etc/init.d/gdm ]; then
35
	/etc/init.d/gdm reload
35
	invoke-rc.d gdm reload
36
fi
36
fi
37
37
38
exit 0
38
exit 0
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/05_rdate (-2 / +2 lines)
 Lines 36-43   ucs_ignore_interface Link Here 
36
36
37
[ ! -f /var/run/ntpd.pid ] && exit 0
37
[ ! -f /var/run/ntpd.pid ] && exit 0
38
38
39
/etc/init.d/rdate start
39
invoke-rc.d rdate start
40
40
41
/etc/init.d/ntp start
41
invoke-rc.d ntp start
42
42
43
exit 0
43
exit 0
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/15_nscd (-1 / +1 lines)
 Lines 36-42   ucs_ignore_interface Link Here 
36
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
36
[ ! -f /var/run/nscd/nscd.pid ] && exit 0
37
37
38
if [ -x /etc/init.d/nscd ]; then
38
if [ -x /etc/init.d/nscd ]; then
39
	/etc/init.d/nscd restart
39
	invoke-rc.d nscd restart
40
	nscd -i passwd
40
	nscd -i passwd
41
	nscd -i group
41
	nscd -i group
42
fi
42
fi
(-)a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/50_gdm (-1 / +1 lines)
 Lines 61-67   fi Link Here 
61
61
62
if [ -x /etc/init.d/gdm ]; then
62
if [ -x /etc/init.d/gdm ]; then
63
	if [ "$reload" = "true" ]; then
63
	if [ "$reload" = "true" ]; then
64
		/etc/init.d/gdm reload
64
		invoke-rc.d gdm reload
65
	fi
65
	fi
66
fi
66
fi
67
67
(-)a/branches/ucs-3.0/ucs/mail/univention-antivir-mail/debian/univention-antivir-mail.postinst (-4 / +3 lines)
 Lines 59-67   univention-config-registry set mail/antivir/amavis/autostart?"yes" \ Link Here 
59
59
60
#DEBHELPER#
60
#DEBHELPER#
61
61
62
test -x /etc/init.d/clamav-daemon && /etc/init.d/clamav-daemon restart || true
62
test -x /etc/init.d/clamav-daemon && invoke-rc.d clamav-daemon restart || true
63
test -x /etc/init.d/spamassassin && /etc/init.d/spamassassin restart || true
63
test -x /etc/init.d/spamassassin && invoke-rc.d spamassassin restart || true
64
64
test -x /etc/init.d/amavis && invoke-rc.d amavis restart || true
65
/etc/init.d/amavis restart
66
65
67
exit 0
66
exit 0
(-)a/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail-schema.postinst (-1 / +1 lines)
 Lines 36-42   eval "$(univention-config-registry shell)" Link Here 
36
36
37
univention-config-registry commit /etc/ldap/slapd.conf
37
univention-config-registry commit /etc/ldap/slapd.conf
38
38
39
/etc/init.d/slapd crestart
39
invoke-rc.d slapd crestart
40
40
41
. /usr/share/univention-lib/all.sh
41
. /usr/share/univention-lib/all.sh
42
42
(-)a/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail.postinst (-1 / +1 lines)
 Lines 37-42   univention-config-registry set fetchmail/enabled?yes Link Here 
37
. /usr/share/univention-lib/all.sh
37
. /usr/share/univention-lib/all.sh
38
call_joinscript 92univention-fetchmail.inst
38
call_joinscript 92univention-fetchmail.inst
39
39
40
/etc/init.d/univention-directory-listener crestart
40
invoke-rc.d univention-directory-listener crestart
41
41
42
exit 0
42
exit 0
(-)a/branches/ucs-3.0/ucs/mail/univention-horde4/debian/univention-horde4.postinst (-1 / +1 lines)
 Lines 100-106   call_joinscript 85univention-horde4.inst Link Here 
100
dpkg-statoverride --add --update --quiet root www-data 4750 /usr/share/univention-horde4/univention-horde-login-wrapper
100
dpkg-statoverride --add --update --quiet root www-data 4750 /usr/share/univention-horde4/univention-horde-login-wrapper
101
101
102
if [ -x /etc/init.d/apache2 ]; then
102
if [ -x /etc/init.d/apache2 ]; then
103
	/etc/init.d/apache2 reload
103
	invoke-rc.d apache2 reload
104
fi
104
fi
105
105
106
exit 0
106
exit 0
(-)a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/debian/univention-mail-cyrus-murder.postinst (-1 / +1 lines)
 Lines 50-56   fi Link Here 
50
univention-config-registry set mail/cyrus/murder/crontime='0 2 * * *'
50
univention-config-registry set mail/cyrus/murder/crontime='0 2 * * *'
51
51
52
# activate the listener modules
52
# activate the listener modules
53
/etc/init.d/univention-directory-listener restart
53
invoke-rc.d univention-directory-listener restart
54
54
55
# configure firewall
55
# configure firewall
56
ucr set \
56
ucr set \
(-)a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/usr/lib/univention-server/server_password_change.d/univention-mail-cyrus-murder (-2 / +2 lines)
 Lines 37-46   if [ "$1" = "postchange" -o "$1" = "nochange" ] ; then Link Here 
37
	univention-config-registry commit /etc/imapd/imapd.conf /etc/imapd/frontend.conf
37
	univention-config-registry commit /etc/imapd/imapd.conf /etc/imapd/frontend.conf
38
	
38
	
39
	if [ -x "/etc/init.d/cyrus-imapd" ]; then
39
	if [ -x "/etc/init.d/cyrus-imapd" ]; then
40
		/etc/init.d/cyrus-imapd reload
40
		invoke-rc.d cyrus-imapd reload
41
	fi
41
	fi
42
42
43
	if [ -x "/etc/init.d/cyrus2.2" ]; then
43
	if [ -x "/etc/init.d/cyrus2.2" ]; then
44
		/etc/init.d/cyrus2.2 reload
44
		invoke-rc.d cyrus2.2 reload
45
	fi
45
	fi
46
fi
46
fi
(-)a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus/debian/univention-mail-cyrus.postinst (-5 / +5 lines)
 Lines 112-120   fi Link Here 
112
112
113
# restart saslauthd
113
# restart saslauthd
114
if [ -x /etc/init.d/saslauthd ]; then
114
if [ -x /etc/init.d/saslauthd ]; then
115
	/etc/init.d/saslauthd stop || true
115
	invoke-rc.d saslauthd stop || true
116
	sleep 1
116
	sleep 1
117
	/etc/init.d/saslauthd start || true
117
	invoke-rc.d saslauthd start || true
118
fi
118
fi
119
119
120
# run join script
120
# run join script
 Lines 124-138   fi Link Here 
124
124
125
# restart cyrus
125
# restart cyrus
126
if [ -x /etc/init.d/cyrus2.2 ]; then
126
if [ -x /etc/init.d/cyrus2.2 ]; then
127
	/etc/init.d/cyrus2.2 restart
127
	invoke-rc.d cyrus2.2 restart
128
fi
128
fi
129
if [ -x /etc/init.d/cyrus-imapd ]; then
129
if [ -x /etc/init.d/cyrus-imapd ]; then
130
	/etc/init.d/cyrus-imapd restart
130
	invoke-rc.d cyrus-imapd restart
131
fi
131
fi
132
132
133
# restart listener
133
# restart listener
134
if [ -x /etc/init.d/univention-directory-listener ]; then
134
if [ -x /etc/init.d/univention-directory-listener ]; then
135
	/etc/init.d/univention-directory-listener crestart
135
	invoke-rc.d univention-directory-listener crestart
136
fi
136
fi
137
137
138
# configure firewall
138
# configure firewall
(-)a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-postfix.postinst (-1 / +1 lines)
 Lines 96-102   adduser postfix sasl Link Here 
96
univention-config-registry commit /etc/mailname
96
univention-config-registry commit /etc/mailname
97
97
98
if [ -z "$postfix_autostart" ] || [ "$postfix_autostart" = "yes" ]; then
98
if [ -z "$postfix_autostart" ] || [ "$postfix_autostart" = "yes" ]; then
99
	/etc/init.d/postfix restart
99
	invoke-rc.d postfix restart
100
fi
100
fi
101
101
102
exit 0
102
exit 0
(-)a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-server.postinst (-2 / +2 lines)
 Lines 46-58   for file in transport virtual canonical access relocated; do Link Here 
46
done
46
done
47
47
48
# restart to activate new listener module
48
# restart to activate new listener module
49
/etc/init.d/univention-directory-listener crestart
49
invoke-rc.d univention-directory-listener crestart
50
50
51
. /usr/share/univention-lib/all.sh
51
. /usr/share/univention-lib/all.sh
52
call_joinscript 67univention-mail-server.inst
52
call_joinscript 67univention-mail-server.inst
53
53
54
if [ -z "$postfix_autostart" ] || [ "$postfix_autostart" = "yes" ]; then
54
if [ -z "$postfix_autostart" ] || [ "$postfix_autostart" = "yes" ]; then
55
	/etc/init.d/postfix restart
55
	invoke-rc.d postfix restart
56
fi
56
fi
57
57
58
# configure firewall
58
# configure firewall
(-)a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/usr/lib/univention-server/server_password_change.d/50univention-mail-server (-2 / +2 lines)
 Lines 35-41   if [ "$1" = "prechange" ] ; then Link Here 
35
	if /etc/init.d/postfix status | grep -q "is running" ; then
35
	if /etc/init.d/postfix status | grep -q "is running" ; then
36
		univention-config-registry set mail/postfix/stoppedbyserverpasswordchange=yes
36
		univention-config-registry set mail/postfix/stoppedbyserverpasswordchange=yes
37
		echo "stopping postfix due to upcoming server password change" | logger -t "server-password-change"
37
		echo "stopping postfix due to upcoming server password change" | logger -t "server-password-change"
38
		/etc/init.d/postfix stop
38
		invoke-rc.d postfix stop
39
	fi
39
	fi
40
fi
40
fi
41
41
 Lines 45-51   if [ "$1" = "postchange" -o "$1" = "nochange" ] ; then Link Here 
45
	# start postfix only if it has been stopped by this script
45
	# start postfix only if it has been stopped by this script
46
	if [ "$mail_postfix_stoppedbyserverpasswordchange" = "yes" ] ; then
46
	if [ "$mail_postfix_stoppedbyserverpasswordchange" = "yes" ] ; then
47
		echo "starting postfix after server password change" | logger -t "server-password-change"
47
		echo "starting postfix after server password change" | logger -t "server-password-change"
48
		/etc/init.d/postfix start
48
		invoke-rc.d postfix start
49
		univention-config-registry unset mail/postfix/stoppedbyserverpasswordchange
49
		univention-config-registry unset mail/postfix/stoppedbyserverpasswordchange
50
	fi
50
	fi
51
fi
51
fi
(-)a/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postinst (-1 / +1 lines)
 Lines 44-50   univention-config-registry set mail/antivir/spam?yes \ Link Here 
44
	mail/antispam/autostart?yes
44
	mail/antispam/autostart?yes
45
45
46
if [ -x /etc/init.d/postfix ]; then
46
if [ -x /etc/init.d/postfix ]; then
47
	/etc/init.d/postfix reload || true
47
	invoke-rc.d postfix reload || true
48
fi
48
fi
49
49
50
#DEBHELPER#
50
#DEBHELPER#
(-)a/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postrm (-1 / +1 lines)
 Lines 36-42    Link Here 
36
ucr set mail/antivir/spam=no
36
ucr set mail/antivir/spam=no
37
37
38
if [ -x /etc/init.d/postfix ]; then
38
if [ -x /etc/init.d/postfix ]; then
39
	/etc/init.d/postfix restart
39
	invoke-rc.d postfix restart
40
fi
40
fi
41
41
42
exit 0
42
exit 0
(-)a/branches/ucs-3.0/ucs/management/univention-admingrp-user-passwordreset/debian/univention-admingrp-user-passwordreset.postinst (-1 / +1 lines)
 Lines 46-52   case "$1" in Link Here 
46
				ldap/acl/user/passwordreset/attributes?"krb5Key,userPassword,sambaPwdCanChange,sambaPwdMustChange,sambaLMPassword,sambaNTPassword,sambaPwdLastSet,pwhistory,sambaPasswordHistory,krb5KDCFlags,krb5KeyVersionNumber,krb5PasswordEnd,shadowMax,shadowLastChange"
46
				ldap/acl/user/passwordreset/attributes?"krb5Key,userPassword,sambaPwdCanChange,sambaPwdMustChange,sambaLMPassword,sambaNTPassword,sambaPwdLastSet,pwhistory,sambaPasswordHistory,krb5KDCFlags,krb5KeyVersionNumber,krb5PasswordEnd,shadowMax,shadowLastChange"
47
47
48
		# restart LDAP server
48
		# restart LDAP server
49
		/etc/init.d/slapd crestart
49
		invoke-rc.d slapd crestart
50
		;;
50
		;;
51
51
52
	*)
52
	*)
(-)a/branches/ucs-3.0/ucs/management/univention-directory-listener/03univention-directory-listener.inst (-2 / +2 lines)
 Lines 104-110   sleep 15 Link Here 
104
104
105
if [ -f /etc/init.d/slapd ]
105
if [ -f /etc/init.d/slapd ]
106
    then
106
    then
107
    /etc/init.d/slapd restart
107
    invoke-rc.d slapd restart
108
fi
108
fi
109
109
110
if [ $exit_status != 0 ]; then
110
if [ $exit_status != 0 ]; then
 Lines 119-125   if test -e "/var/lib/univention-directory-listener/handlers/replication"; then Link Here 
119
fi
119
fi
120
120
121
# The samba join script needs a running listener. Bug #19128
121
# The samba join script needs a running listener. Bug #19128
122
/etc/init.d/univention-directory-listener start
122
invoke-rc.d univention-directory-listener start
123
123
124
test -x /usr/sbin/nscd && /usr/sbin/nscd -i passwd
124
test -x /usr/sbin/nscd && /usr/sbin/nscd -i passwd
125
test -x /usr/sbin/nscd && /usr/sbin/nscd -i group
125
test -x /usr/sbin/nscd && /usr/sbin/nscd -i group
(-)a/branches/ucs-3.0/ucs/management/univention-directory-listener/debian/univention-directory-listener.postinst (-1 / +1 lines)
 Lines 92-98   if [ "$1" = "configure" -a -n "$2" ]; then Link Here 
92
		mv /var/lib/univention-directory-listener/__* /var/univention-backup/listener-cache-ucs_3.0-ms1/
92
		mv /var/lib/univention-directory-listener/__* /var/univention-backup/listener-cache-ucs_3.0-ms1/
93
		mv /var/lib/univention-directory-listener/log.* /var/univention-backup/listener-cache-ucs_3.0-ms1/
93
		mv /var/lib/univention-directory-listener/log.* /var/univention-backup/listener-cache-ucs_3.0-ms1/
94
	fi
94
	fi
95
	/etc/init.d/univention-directory-listener crestart
95
	invoke-rc.d univention-directory-listener crestart
96
fi
96
fi
97
97
98
exit 0
98
exit 0
(-)a/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postinst (-2 / +2 lines)
 Lines 57-70   if [ "$1" = "configure" ]; then Link Here 
57
	univention-config-registry commit /etc/ldap/slapd.conf
57
	univention-config-registry commit /etc/ldap/slapd.conf
58
58
59
	## restart the OpenLDAP Server to load the module
59
	## restart the OpenLDAP Server to load the module
60
	/etc/init.d/slapd restart
60
	invoke-rc.d slapd restart
61
61
62
	# exclude temporary objects by default
62
	# exclude temporary objects by default
63
	eval "$(univention-config-registry shell ldap/base)"
63
	eval "$(univention-config-registry shell ldap/base)"
64
	univention-config-registry set "${registrySection}/exclude1"?"cn=temporary,cn=univention,$ldap_base"
64
	univention-config-registry set "${registrySection}/exclude1"?"cn=temporary,cn=univention,$ldap_base"
65
65
66
	## load the listener module
66
	## load the listener module
67
	/etc/init.d/univention-directory-listener crestart
67
	invoke-rc.d univention-directory-listener crestart
68
68
69
fi
69
fi
70
70
(-)a/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postrm (-2 / +2 lines)
 Lines 39-45   dellog=${workdir}/dellog Link Here 
39
case "$1" in
39
case "$1" in
40
	"remove")
40
	"remove")
41
		## unload the listener module
41
		## unload the listener module
42
		/etc/init.d/univention-directory-listener crestart
42
		invoke-rc.d univention-directory-listener crestart
43
43
44
		## unset directory variable, to stop dellog template activation
44
		## unset directory variable, to stop dellog template activation
45
		univention-config-registry unset "${registrySection}/dellogdir"
45
		univention-config-registry unset "${registrySection}/dellogdir"
 Lines 48-54   case "$1" in Link Here 
48
		univention-config-registry commit /etc/ldap/slapd.conf
48
		univention-config-registry commit /etc/ldap/slapd.conf
49
49
50
		## restart the OpenLDAP Server to unload the overlay
50
		## restart the OpenLDAP Server to unload the overlay
51
		/etc/init.d/slapd restart
51
		invoke-rc.d slapd restart
52
52
53
		## unset main ucr variable
53
		## unset main ucr variable
54
		univention-config-registry unset "${registrySection}"
54
		univention-config-registry unset "${registrySection}"
(-)a/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/test/univention-admin-test (-2 / +2 lines)
 Lines 635-641   EOF Link Here 
635
	fi
635
	fi
636
	cp /etc/ldap/slapd.conf /etc/ldap/slapd.conf.testbackup
636
	cp /etc/ldap/slapd.conf /etc/ldap/slapd.conf.testbackup
637
	echo '/^schemacheck		on
Oinclude			/etc/ldap/schema/testolb.schema
include			/etc/ldap/schema/testolbperson.schema
:wq' | vim /etc/ldap/slapd.conf >/dev/null 2>/dev/null
637
	echo '/^schemacheck		on
Oinclude			/etc/ldap/schema/testolb.schema
include			/etc/ldap/schema/testolbperson.schema
:wq' | vim /etc/ldap/slapd.conf >/dev/null 2>/dev/null
638
	/etc/init.d/slapd restart
638
	invoke-rc.d slapd restart
639
639
640
	adminwrap $LINENO settings/customattribute create --set module=users/user --set objectClass=testfiliale --set syntax=string --set ldapMapping=testfilialbereich --set shortDescription=\"testFilial bereich\" --set longDescription=testFilialbereich --set name=testfiliale --set multivalue=1 --position \"cn=custom attributes,cn=univention,$ldap_base\"
640
	adminwrap $LINENO settings/customattribute create --set module=users/user --set objectClass=testfiliale --set syntax=string --set ldapMapping=testfilialbereich --set shortDescription=\"testFilial bereich\" --set longDescription=testFilialbereich --set name=testfiliale --set multivalue=1 --position \"cn=custom attributes,cn=univention,$ldap_base\"
641
641
 Lines 5159-5165   then Link Here 
5159
	adminwrap $LINENO settings/customattribute remove --dn \"cn=testfiliale,cn=custom attributes,cn=univention,$ldap_base\"
5159
	adminwrap $LINENO settings/customattribute remove --dn \"cn=testfiliale,cn=custom attributes,cn=univention,$ldap_base\"
5160
	adminwrap $LINENO settings/customattribute remove --dn \"cn=testpctyp,cn=custom attributes,cn=univention,$ldap_base\"
5160
	adminwrap $LINENO settings/customattribute remove --dn \"cn=testpctyp,cn=custom attributes,cn=univention,$ldap_base\"
5161
	mv /etc/ldap/slapd.conf.testbackup /etc/ldap/slapd.conf
5161
	mv /etc/ldap/slapd.conf.testbackup /etc/ldap/slapd.conf
5162
	/etc/init.d/slapd restart
5162
	invoke-rc.d slapd restart
5163
fi
5163
fi
5164
5164
5165
createcomputers_managedclient()
5165
createcomputers_managedclient()
(-)a/branches/ucs-3.0/ucs/management/univention-directory-notifier/02univention-directory-notifier.inst (-1 / +1 lines)
 Lines 43-49   test -n "`grep "univention-directory-notifier v${VERSION} successful" /usr/lib/u Link Here 
43
43
44
ln -sf /etc/runit/univention-directory-notifier /etc/runit/univention/univention-directory-notifier
44
ln -sf /etc/runit/univention-directory-notifier /etc/runit/univention/univention-directory-notifier
45
45
46
/etc/init.d/univention-directory-notifier start
46
invoke-rc.d univention-directory-notifier start
47
47
48
test -n "`grep "univention-directory-notifier v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-notifier v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
48
test -n "`grep "univention-directory-notifier v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-notifier v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
49
49
(-)a/branches/ucs-3.0/ucs/management/univention-directory-notifier/15univention-directory-notifier-post.inst (-2 / +2 lines)
 Lines 55-65   if [ ! -e /var/lib/univention-ldap/$i.lock ]; then Link Here 
55
fi
55
fi
56
56
57
if [ -x /etc/init.d/univention-directory-notifier ]; then
57
if [ -x /etc/init.d/univention-directory-notifier ]; then
58
	/etc/init.d/univention-directory-notifier restart
58
	invoke-rc.d univention-directory-notifier restart
59
fi
59
fi
60
60
61
if [ -x /etc/init.d/univention-directory-listener ]; then
61
if [ -x /etc/init.d/univention-directory-listener ]; then
62
	/etc/init.d/univention-directory-listener restart
62
	invoke-rc.d univention-directory-listener restart
63
fi
63
fi
64
64
65
test -n "`grep "univention-directory-notifier-post v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-notifier-post v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
65
test -n "`grep "univention-directory-notifier-post v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-notifier-post v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
(-)a/branches/ucs-3.0/ucs/management/univention-directory-notifier/debian/univention-directory-notifier.postinst (-3 / +3 lines)
 Lines 110-121   fi Link Here 
110
110
111
if [ "$1" = "configure" -a -n "$2" ]; then
111
if [ "$1" = "configure" -a -n "$2" ]; then
112
	if dpkg --compare-versions "$2" lt 1.10; then
112
	if dpkg --compare-versions "$2" lt 1.10; then
113
		/etc/init.d/univention-directory-notifier restart || true
113
		invoke-rc.d univention-directory-notifier restart || true
114
	else
114
	else
115
		/etc/init.d/univention-directory-notifier crestart || true
115
		invoke-rc.d univention-directory-notifier crestart || true
116
	fi
116
	fi
117
elif [ "$1" = "configure" ]; then
117
elif [ "$1" = "configure" ]; then
118
	/etc/init.d/univention-directory-notifier restart || true
118
	invoke-rc.d univention-directory-notifier restart || true
119
fi
119
fi
120
120
121
exit 0
121
exit 0
(-)a/branches/ucs-3.0/ucs/management/univention-directory-replication/debian/postinst (-1 / +1 lines)
 Lines 45-50   univention-config-registry set ldap/replication/filesystem/check?false \ Link Here 
45
45
46
#DEBHELPER#
46
#DEBHELPER#
47
47
48
/etc/init.d/univention-directory-listener crestart
48
invoke-rc.d univention-directory-listener crestart
49
49
50
exit 0
50
exit 0
(-)a/branches/ucs-3.0/ucs/management/univention-directory-replication/replication.py (-1 / +1 lines)
 Lines 842-848   def handler(dn, new, listener_old): Link Here 
842
				s.close()
842
				s.close()
843
843
844
				listener.setuid(0)
844
				listener.setuid(0)
845
				os.system('/etc/init.d/univention-directory-listener stop')
845
				os.system('invoke-rc.d univention-directory-listener stop')
846
				listener.unsetuid()
846
				listener.unsetuid()
847
847
848
		# Read old entry directly from LDAP server
848
		# Read old entry directly from LDAP server
(-)a/branches/ucs-3.0/ucs/management/univention-directory-replication/univention-directory-replication-resync (-1 / +1 lines)
 Lines 111-117   then Link Here 
111
		mkdir -p /var/lib/univention-directory-replication; chmod -R 700 /var/lib/univention-directory-replication
111
		mkdir -p /var/lib/univention-directory-replication; chmod -R 700 /var/lib/univention-directory-replication
112
	fi
112
	fi
113
	mv $1 "/var/lib/univention-directory-replication/replayed.ldif_$d"; chmod 600 "/var/lib/univention-directory-replication/replayed.ldif_$d"
113
	mv $1 "/var/lib/univention-directory-replication/replayed.ldif_$d"; chmod 600 "/var/lib/univention-directory-replication/replayed.ldif_$d"
114
	/etc/init.d/univention-directory-listener start
114
	invoke-rc.d univention-directory-listener start
115
	exit 0
115
	exit 0
116
else
116
else
117
	echo "some DNs have failed and have to be synced manually:"
117
	echo "some DNs have failed and have to be synced manually:"
(-)a/branches/ucs-3.0/ucs/management/univention-join/univention-join (-12 / +12 lines)
 Lines 226-232   if [ -z "$DCNAME" ]; then Link Here 
226
				echo -e "\033[60Gdone"
226
				echo -e "\033[60Gdone"
227
				echo "domain $domainname" >/etc/resolv.conf
227
				echo "domain $domainname" >/etc/resolv.conf
228
				echo "nameserver $i" >>/etc/resolv.conf
228
				echo "nameserver $i" >>/etc/resolv.conf
229
				test -x /etc/init.d/nscd && /etc/init.d/nscd restart >>/var/log/univention/join.log 2>&1
229
				test -x /etc/init.d/nscd && invoke-rc.d nscd restart >>/var/log/univention/join.log 2>&1
230
				break
230
				break
231
			fi
231
			fi
232
		done
232
		done
 Lines 255-267   echo -e "\033[60Gdone" Link Here 
255
255
256
if [ -x /etc/init.d/slapd ]; then
256
if [ -x /etc/init.d/slapd ]; then
257
	echo -n "Stop LDAP Server: "
257
	echo -n "Stop LDAP Server: "
258
	/etc/init.d/slapd stop >>/var/log/univention/join.log 2>&1
258
	invoke-rc.d slapd stop >>/var/log/univention/join.log 2>&1
259
	echo -e "\033[60Gdone"
259
	echo -e "\033[60Gdone"
260
fi
260
fi
261
261
262
if [ -x /etc/init.d/samba4 ]; then
262
if [ -x /etc/init.d/samba4 ]; then
263
	echo -n "Stop Samba 4 Server: "
263
	echo -n "Stop Samba 4 Server: "
264
	/etc/init.d/samba4 stop >>/var/log/univention/join.log 2>&1
264
	invoke-rc.d samba4 stop >>/var/log/univention/join.log 2>&1
265
	echo -e "\033[60Gdone"
265
	echo -e "\033[60Gdone"
266
fi
266
fi
267
267
 Lines 282-288   fi Link Here 
282
282
283
if [ -x /etc/init.d/slapd ]; then
283
if [ -x /etc/init.d/slapd ]; then
284
	echo -n "Start LDAP Server: "
284
	echo -n "Start LDAP Server: "
285
	/etc/init.d/slapd start >>/var/log/univention/join.log 2>&1
285
	invoke-rc.d slapd start >>/var/log/univention/join.log 2>&1
286
	echo -e "\033[60Gdone"
286
	echo -e "\033[60Gdone"
287
fi
287
fi
288
288
 Lines 420-435   fi Link Here 
420
notifier_pid=`pidof univention-directory-notifier`
420
notifier_pid=`pidof univention-directory-notifier`
421
if [ -n "$notifier_pid" -a -e /etc/runit/univention/univention-directory-notifier ]; then
421
if [ -n "$notifier_pid" -a -e /etc/runit/univention/univention-directory-notifier ]; then
422
	echo -n "Stopping univention-directory-notifier daemon: "
422
	echo -n "Stopping univention-directory-notifier daemon: "
423
	/etc/init.d/univention-directory-notifier stop >/dev/null 2>&1
423
	invoke-rc.d univention-directory-notifier stop >/dev/null 2>&1
424
	while ! sv status univention-directory-notifier | grep "^down" >/dev/null ; do sleep 1; /etc/init.d/univention-directory-notifier stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
424
	while ! sv status univention-directory-notifier | grep "^down" >/dev/null ; do sleep 1; invoke-rc.d univention-directory-notifier stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
425
fi
425
fi
426
426
427
# Stop Listener
427
# Stop Listener
428
listener_pid=`pidof univention-directory-listener`
428
listener_pid=`pidof univention-directory-listener`
429
if [ -e /etc/runit/univention/univention-directory-listener ]; then
429
if [ -e /etc/runit/univention/univention-directory-listener ]; then
430
	echo -n "Stopping univention-directory-listener daemon: "
430
	echo -n "Stopping univention-directory-listener daemon: "
431
	/etc/init.d/univention-directory-listener stop >/dev/null 2>&1
431
	invoke-rc.d univention-directory-listener stop >/dev/null 2>&1
432
	while ! sv status univention-directory-listener | grep "^down" >/dev/null ; do sleep 1; /etc/init.d/univention-directory-listener stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
432
	while ! sv status univention-directory-listener | grep "^down" >/dev/null ; do sleep 1; invoke-rc.d univention-directory-listener stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
433
fi
433
fi
434
rm -Rf /var/lib/univention-directory-listener/*
434
rm -Rf /var/lib/univention-directory-listener/*
435
435
 Lines 503-509   if [ "$server_role" = "domaincontroller_backup" ]; then Link Here 
503
	echo -e "\033[60Gdone"
503
	echo -e "\033[60Gdone"
504
504
505
	echo -n "Restart LDAP Server: "
505
	echo -n "Restart LDAP Server: "
506
	/etc/init.d/slapd restart >>/var/log/univention/join.log 2>&1
506
	invoke-rc.d slapd restart >>/var/log/univention/join.log 2>&1
507
	echo -e "\033[60Gdone"
507
	echo -e "\033[60Gdone"
508
508
509
	#TODO: implement a real sync
509
	#TODO: implement a real sync
 Lines 594-600   elif [ "$server_role" = "domaincontroller_slave" ]; then Link Here 
594
	fi
594
	fi
595
595
596
	echo -n "Restart LDAP Server: "
596
	echo -n "Restart LDAP Server: "
597
	/etc/init.d/slapd restart >>/var/log/univention/join.log 2>&1
597
	invoke-rc.d slapd restart >>/var/log/univention/join.log 2>&1
598
	echo -e "\033[60Gdone"
598
	echo -e "\033[60Gdone"
599
599
600
	echo -n "Sync Kerberos settings: "
600
	echo -n "Sync Kerberos settings: "
 Lines 737-748   else Link Here 
737
fi
737
fi
738
738
739
if [ -d /etc/runit/univention-directory-notifier ]; then
739
if [ -d /etc/runit/univention-directory-notifier ]; then
740
	/etc/init.d/univention-directory-notifier restart >>/var/log/univention/join.log 2>&1
740
	invoke-rc.d univention-directory-notifier restart >>/var/log/univention/join.log 2>&1
741
	sleep 3
741
	sleep 3
742
fi
742
fi
743
743
744
if [ -d /etc/runit/univention-directory-listener ]; then
744
if [ -d /etc/runit/univention-directory-listener ]; then
745
	/etc/init.d/univention-directory-listener restart >>/var/log/univention/join.log 2>&1
745
	invoke-rc.d univention-directory-listener restart >>/var/log/univention/join.log 2>&1
746
fi
746
fi
747
747
748
if [ -n "$REMOVE_PWD_FILE" -a -n "$DCPWD" ]; then
748
if [ -n "$REMOVE_PWD_FILE" -a -n "$DCPWD" ]; then
(-)a/branches/ucs-3.0/ucs/management/univention-ldap-overlay-memberof/debian/postinst (-1 / +1 lines)
 Lines 47-53   if [ ! "$server_role" = "domaincontroller_master" ] ; then Link Here 
47
fi
47
fi
48
48
49
if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontroller_backup" -o  "$server_role" = "domaincontroller_slave" ] ; then
49
if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontroller_backup" -o  "$server_role" = "domaincontroller_slave" ] ; then
50
	/etc/init.d/slapd crestart
50
	invoke-rc.d slapd crestart
51
fi
51
fi
52
52
53
exit 0
53
exit 0
(-)a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-client.postinst (-1 / +1 lines)
 Lines 33-39    Link Here 
33
if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 1.6; then
33
if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 1.6; then
34
	univention-config-registry set nsswitch/ldap=yes
34
	univention-config-registry set nsswitch/ldap=yes
35
35
36
	test -x /etc/init.d/nscd && /etc/init.d/nscd restart
36
	test -x /etc/init.d/nscd && invoke-rc.d nscd restart
37
fi
37
fi
38
38
39
#DEBHELPER#
39
#DEBHELPER#
(-)a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-config.postinst (-2 / +2 lines)
 Lines 38-46   then Link Here 
38
    server_role=$(ucr get server/role)
38
    server_role=$(ucr get server/role)
39
    if [ "$server_role" = "domaincontroller_master" ]
39
    if [ "$server_role" = "domaincontroller_master" ]
40
	then
40
	then
41
		/etc/init.d/slapd restart
41
		invoke-rc.d slapd restart
42
    else
42
    else
43
		grep -q crestart /etc/init.d/slapd && /etc/init.d/slapd crestart || true
43
		grep -q crestart /etc/init.d/slapd && invoke-rc.d slapd crestart || true
44
    fi
44
    fi
45
fi
45
fi
46
46
(-)a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-server.postinst (-6 / +6 lines)
 Lines 41-54   fi Link Here 
41
stop_slapd ()
41
stop_slapd ()
42
{
42
{
43
	if test -x /etc/init.d/slapd; then
43
	if test -x /etc/init.d/slapd; then
44
		/etc/init.d/slapd stop
44
		invoke-rc.d slapd stop
45
		sleep 1
45
		sleep 1
46
	fi
46
	fi
47
}
47
}
48
48
49
restart_slapd ()
49
restart_slapd ()
50
{
50
{
51
	/etc/init.d/slapd stop
51
	invoke-rc.d slapd stop
52
	sleep 1
52
	sleep 1
53
	if [ -n "$(pidof slapd)" ]; then
53
	if [ -n "$(pidof slapd)" ]; then
54
		killall slapd
54
		killall slapd
 Lines 58-64   restart_slapd () Link Here 
58
			sleep 1
58
			sleep 1
59
		fi
59
		fi
60
	fi
60
	fi
61
	/etc/init.d/slapd start
61
	invoke-rc.d slapd start
62
}
62
}
63
# } # end of function definitions
63
# } # end of function definitions
64
64
 Lines 168-174   if is_ucr_true "ldap/index/autorebuild" ; then Link Here 
168
	{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
168
	{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
169
169
170
	if test -x /etc/init.d/slapd; then
170
	if test -x /etc/init.d/slapd; then
171
		/etc/init.d/slapd start
171
		invoke-rc.d slapd start
172
	fi
172
	fi
173
else
173
else
174
	univention-config-registry set ldap/index/eq?"$recommended_ldap_index_eq" \
174
	univention-config-registry set ldap/index/eq?"$recommended_ldap_index_eq" \
 Lines 201-207   if [ "$1" = "configure" -a -n "$2" ]; Link Here 
201
			then
201
			then
202
			restart_slapd
202
			restart_slapd
203
		else
203
		else
204
			#/etc/init.d/slapd crestart
204
			#invoke-rc.d slapd crestart
205
			if [ -n "$slapd_was_running" ]; then
205
			if [ -n "$slapd_was_running" ]; then
206
				restart_slapd
206
				restart_slapd
207
			fi
207
			fi
 Lines 212-218   else Link Here 
212
		then
212
		then
213
		if test -x /etc/init.d/slapd
213
		if test -x /etc/init.d/slapd
214
			then
214
			then
215
			/etc/init.d/slapd start
215
			invoke-rc.d slapd start
216
		fi
216
		fi
217
	fi
217
	fi
218
fi
218
fi
(-)a/branches/ucs-3.0/ucs/management/univention-ldap/test/listner-notifier-test (-5 / +5 lines)
 Lines 270-283   printf "\b\b\b\b\b\b\b \n" Link Here 
270
stop () # stopping daemon on remote host using init-script
270
stop () # stopping daemon on remote host using init-script
271
{
271
{
272
echo -e "\v===> stopping $what on $where"
272
echo -e "\v===> stopping $what on $where"
273
cmd="/etc/init.d/$what stop"
273
cmd="invoke-rc.d $what stop"
274
univention-ssh -timeout 60 $pw root@$where $cmd
274
univention-ssh -timeout 60 $pw root@$where $cmd
275
}
275
}
276
276
277
start () # starting daemon on remote host using init-script
277
start () # starting daemon on remote host using init-script
278
{
278
{
279
echo -e "\v===> starting $what on $where"
279
echo -e "\v===> starting $what on $where"
280
cmd="/etc/init.d/$what start"
280
cmd="invoke-rc.d $what start"
281
univention-ssh -timeout 60 $pw root@$where $cmd
281
univention-ssh -timeout 60 $pw root@$where $cmd
282
}
282
}
283
283
 Lines 285-291   reset () Link Here 
285
{
285
{
286
echo -e "\v ------ resetting all needed daemon  ------"
286
echo -e "\v ------ resetting all needed daemon  ------"
287
287
288
cmd="/etc/init.d/univention-directory-listener start"
288
cmd="invoke-rc.d univention-directory-listener start"
289
echo -e "\v===>master:"
289
echo -e "\v===>master:"
290
univention-ssh -timeout 60 $pw root@$master $cmd
290
univention-ssh -timeout 60 $pw root@$master $cmd
291
echo -e "\v===>backup:"
291
echo -e "\v===>backup:"
 Lines 293-305   univention-ssh -timeout 60 $pw root@$backup $cmd Link Here 
293
echo -e "\v===>slave:"
293
echo -e "\v===>slave:"
294
univention-ssh -timeout 60 $pw root@$slave $cmd
294
univention-ssh -timeout 60 $pw root@$slave $cmd
295
295
296
cmd="/etc/init.d/univention-directory-notifier start"
296
cmd="invoke-rc.d univention-directory-notifier start"
297
echo -e "\v===>master:"
297
echo -e "\v===>master:"
298
univention-ssh -timeout 60 $pw root@$master $cmd
298
univention-ssh -timeout 60 $pw root@$master $cmd
299
echo -e "\v===>backup:"
299
echo -e "\v===>backup:"
300
univention-ssh -timeout 60 $pw root@$backup $cmd
300
univention-ssh -timeout 60 $pw root@$backup $cmd
301
301
302
cmd="/etc/init.d/slapd start"
302
cmd="invoke-rc.d slapd start"
303
echo -e "\v===>master"
303
echo -e "\v===>master"
304
univention-ssh -timeout 60 $pw root@$master $cmd
304
univention-ssh -timeout 60 $pw root@$master $cmd
305
echo -e "\v===>backup"
305
echo -e "\v===>backup"
(-)a/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.postinst (-3 / +3 lines)
 Lines 53-67   if is_ucr_true "ldap/index/autorebuild" ; then Link Here 
53
	merged_ldap_index_pres="$(merge_csv_unique_sorted "$ldap_index_pres" "$recommended_ldap_index_pres")"
53
	merged_ldap_index_pres="$(merge_csv_unique_sorted "$ldap_index_pres" "$recommended_ldap_index_pres")"
54
	merged_ldap_index_approx="$(merge_csv_unique_sorted "$ldap_index_approx" "$recommended_ldap_index_approx")"
54
	merged_ldap_index_approx="$(merge_csv_unique_sorted "$ldap_index_approx" "$recommended_ldap_index_approx")"
55
55
56
	/etc/init.d/slapd stop
56
	invoke-rc.d slapd stop
57
	univention-config-registry set ldap/index/eq="$merged_ldap_index_eq" \
57
	univention-config-registry set ldap/index/eq="$merged_ldap_index_eq" \
58
                                   ldap/index/pres="$merged_ldap_index_pres" \
58
                                   ldap/index/pres="$merged_ldap_index_pres" \
59
                                   ldap/index/approx="$merged_ldap_index_approx"
59
                                   ldap/index/approx="$merged_ldap_index_approx"
60
	# run slapindex and selectively filter out this unsettling warning from stderr
60
	# run slapindex and selectively filter out this unsettling warning from stderr
61
	{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
61
	{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
62
	/etc/init.d/slapd start
62
	invoke-rc.d slapd start
63
else
63
else
64
	grep -q crestart /etc/init.d/slapd && /etc/init.d/slapd crestart || true
64
	grep -q crestart /etc/init.d/slapd && invoke-rc.d slapd crestart || true
65
fi
65
fi
66
66
67
exit 0
67
exit 0
(-)a/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.prerm (-3 / +3 lines)
 Lines 46-60   if [ "$1" = "remove" ] ; then Link Here 
46
		filtered_ldap_index_pres="$(filter_csv "$ldap_index_pres" "kolabHomeServer|alias")"
46
		filtered_ldap_index_pres="$(filter_csv "$ldap_index_pres" "kolabHomeServer|alias")"
47
		filtered_ldap_index_approx="$(filter_csv "$ldap_index_approx" "kolabHomeServer|alias")"
47
		filtered_ldap_index_approx="$(filter_csv "$ldap_index_approx" "kolabHomeServer|alias")"
48
48
49
		/etc/init.d/slapd stop
49
		invoke-rc.d slapd stop
50
		univention-config-registry set ldap/index/eq="$filtered_ldap_index_eq" \
50
		univention-config-registry set ldap/index/eq="$filtered_ldap_index_eq" \
51
									   ldap/index/pres="$filtered_ldap_index_pres" \
51
									   ldap/index/pres="$filtered_ldap_index_pres" \
52
									   ldap/index/approx="$filtered_ldap_index_approx"
52
									   ldap/index/approx="$filtered_ldap_index_approx"
53
		# run slapindex and selectively filter out this unsettling warning from stderr
53
		# run slapindex and selectively filter out this unsettling warning from stderr
54
		{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
54
		{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
55
		/etc/init.d/slapd start
55
		invoke-rc.d slapd start
56
	else
56
	else
57
		grep -q crestart /etc/init.d/slapd && /etc/init.d/slapd crestart || true
57
		grep -q crestart /etc/init.d/slapd && invoke-rc.d slapd crestart || true
58
	fi
58
	fi
59
fi
59
fi
60
60
(-)a/branches/ucs-3.0/ucs/nagios/univention-nagios/28univention-nagios-server.inst (-1 / +1 lines)
 Lines 44-50   if [ -x /usr/sbin/univention-certificate-check-validity ]; then Link Here 
44
	fi
44
	fi
45
fi
45
fi
46
46
47
/etc/init.d/nagios3 restart 2> /dev/null > /dev/null || true
47
invoke-rc.d nagios3 restart 2> /dev/null > /dev/null || true
48
48
49
univention-directory-manager container/cn create "$@" --ignore_exists --position cn=univention,$ldap_base --set name=console
49
univention-directory-manager container/cn create "$@" --ignore_exists --position cn=univention,$ldap_base --set name=console
50
univention-directory-manager container/cn create "$@" --ignore_exists --position cn=console,cn=univention,$ldap_base --set name=acls
50
univention-directory-manager container/cn create "$@" --ignore_exists --position cn=console,cn=univention,$ldap_base --set name=acls
(-)a/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-client.postinst (-2 / +2 lines)
 Lines 73-83   ucr set security/packetfilter/package/univention-nagios-client/tcp/5666/all="ACC Link Here 
73
if [ "$1" = "configure" ]; then
73
if [ "$1" = "configure" ]; then
74
	if test -f /etc/init.d/univention-directory-listener
74
	if test -f /etc/init.d/univention-directory-listener
75
		then
75
		then
76
		/etc/init.d/univention-directory-listener crestart
76
		invoke-rc.d univention-directory-listener crestart
77
	fi
77
	fi
78
fi
78
fi
79
79
80
/etc/init.d/nagios-nrpe-server restart
80
invoke-rc.d nagios-nrpe-server restart
81
81
82
. /usr/share/univention-lib/base.sh
82
. /usr/share/univention-lib/base.sh
83
call_joinscript 30univention-nagios-client.inst
83
call_joinscript 30univention-nagios-client.inst
(-)a/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-server.postinst (-3 / +3 lines)
 Lines 102-116   fi Link Here 
102
if [ "$1" = "configure" ]; then
102
if [ "$1" = "configure" ]; then
103
	if test -f /etc/init.d/univention-directory-listener
103
	if test -f /etc/init.d/univention-directory-listener
104
		then
104
		then
105
		/etc/init.d/univention-directory-listener crestart
105
		invoke-rc.d univention-directory-listener crestart
106
	fi
106
	fi
107
107
108
	if test -f /etc/init.d/apache2
108
	if test -f /etc/init.d/apache2
109
		then
109
		then
110
		/etc/init.d/apache2 restart
110
		invoke-rc.d apache2 restart
111
	fi
111
	fi
112
112
113
	/etc/init.d/nagios3 restart
113
	invoke-rc.d nagios3 restart
114
fi
114
fi
115
115
116
116
(-)a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0010-2-3-4-5/debian/postinst (-1 / +1 lines)
 Lines 107-113   fi Link Here 
107
if [ "$1" = "configure" ]; then
107
if [ "$1" = "configure" ]; then
108
	if test -f /etc/init.d/univention-directory-listener
108
	if test -f /etc/init.d/univention-directory-listener
109
		then
109
		then
110
		/etc/init.d/univention-directory-listener crestart || true
110
		invoke-rc.d univention-directory-listener crestart || true
111
	fi
111
	fi
112
fi
112
fi
113
113
(-)a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0011-2-3-4-5-6-7-8/debian/postinst (-1 / +1 lines)
 Lines 105-111   fi Link Here 
105
if [ "$1" = "configure" ]; then
105
if [ "$1" = "configure" ]; then
106
	if test -f /etc/init.d/univention-directory-listener
106
	if test -f /etc/init.d/univention-directory-listener
107
		then
107
		then
108
		/etc/init.d/univention-directory-listener crestart || true
108
		invoke-rc.d univention-directory-listener crestart || true
109
	fi
109
	fi
110
fi
110
fi
111
111
(-)a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0013-2/debian/postinst (-1 / +1 lines)
 Lines 105-111   fi Link Here 
105
if [ "$1" = "configure" ]; then
105
if [ "$1" = "configure" ]; then
106
	if test -f /etc/init.d/univention-directory-listener
106
	if test -f /etc/init.d/univention-directory-listener
107
		then
107
		then
108
		/etc/init.d/univention-directory-listener crestart || true
108
		invoke-rc.d univention-directory-listener crestart || true
109
	fi
109
	fi
110
fi
110
fi
111
111
(-)a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector-exchange.postinst (-2 / +2 lines)
 Lines 39-49   univention-config-registry set connector/ad/mapping/user/primarymail=true \ Link Here 
39
#DEBHELPER#
39
#DEBHELPER#
40
40
41
if [ -x /etc/init.d/univention-ad-connector ]; then
41
if [ -x /etc/init.d/univention-ad-connector ]; then
42
    /etc/init.d/univention-ad-connector crestart || true
42
    invoke-rc.d univention-ad-connector crestart || true
43
fi
43
fi
44
44
45
if [ -x /etc/init.d/slapd ]; then
45
if [ -x /etc/init.d/slapd ]; then
46
    /etc/init.d/slapd restart || true
46
    invoke-rc.d slapd restart || true
47
fi
47
fi
48
48
49
call_joinscript 51univention-ad-connector-exchange.inst
49
call_joinscript 51univention-ad-connector-exchange.inst
(-)a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.postinst (-4 / +4 lines)
 Lines 54-61   if [ ! -d /var/lib/univention-connector/ad ]; then Link Here 
54
	chown 0.0 /var/lib/univention-connector/ad
54
	chown 0.0 /var/lib/univention-connector/ad
55
fi
55
fi
56
56
57
/etc/init.d/univention-ad-connector crestart || true
57
invoke-rc.d univention-ad-connector crestart || true
58
/etc/init.d/univention-directory-listener crestart || true
58
invoke-rc.d univention-directory-listener crestart || true
59
59
60
call_joinscript /usr/lib/univention-install/42univention-ad-connector.inst
60
call_joinscript /usr/lib/univention-install/42univention-ad-connector.inst
61
61
 Lines 64-74   call_joinscript /usr/lib/univention-install/42univention-ad-connector.inst Link Here 
64
dpkg-statoverride --update --add root www-data 0710 /var/www/univention-ad-connector
64
dpkg-statoverride --update --add root www-data 0710 /var/www/univention-ad-connector
65
65
66
if [ -x /etc/init.d/univention-management-console-server ]; then
66
if [ -x /etc/init.d/univention-management-console-server ]; then
67
	/etc/init.d/univention-management-console-server crestart
67
	invoke-rc.d univention-management-console-server crestart
68
fi
68
fi
69
69
70
if [ -x /etc/init.d/apache2 ]; then
70
if [ -x /etc/init.d/apache2 ]; then
71
	/etc/init.d/apache2 restart || true
71
	invoke-rc.d apache2 restart || true
72
fi
72
fi
73
73
74
exit 0
74
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.prerm (-1 / +1 lines)
 Lines 32-38    Link Here 
32
32
33
33
34
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
34
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
35
    test -x /etc/init.d/univention-ad-connector && /etc/init.d/univention-ad-connector stop
35
    test -x /etc/init.d/univention-ad-connector && invoke-rc.d univention-ad-connector stop
36
fi
36
fi
37
37
38
#DEBHELPER#
38
#DEBHELPER#
(-)a/branches/ucs-3.0/ucs/services/univention-ad-connector/scripts/prepare-new-instance (-2 / +2 lines)
 Lines 180-186   then Link Here 
180
    /etc/init.d/univention-ad-"$CONFIGBASENAME" stop
180
    /etc/init.d/univention-ad-"$CONFIGBASENAME" stop
181
181
182
    echo "-- stop listener"
182
    echo "-- stop listener"
183
    /etc/init.d/univention-directory-listener stop
183
    invoke-rc.d univention-directory-listener stop
184
184
185
    echo "-- unregister initscript"
185
    echo "-- unregister initscript"
186
    update-rc.d -f univention-ad-"$CONFIGBASENAME" remove
186
    update-rc.d -f univention-ad-"$CONFIGBASENAME" remove
 Lines 221-226   then Link Here 
221
    rm -r /var/lib/univention-"$CONFIGBASENAME"
221
    rm -r /var/lib/univention-"$CONFIGBASENAME"
222
222
223
    echo "-- start listener"
223
    echo "-- start listener"
224
    /etc/init.d/univention-directory-listener start
224
    invoke-rc.d univention-directory-listener start
225
225
226
fi
226
fi
(-)a/branches/ucs-3.0/ucs/services/univention-apache/08univention-apache.inst (-1 / +1 lines)
 Lines 45-51   a2dismod ssl Link Here 
45
a2enmod ssl
45
a2enmod ssl
46
46
47
if [ -z "$UMC_MODE" ]; then
47
if [ -z "$UMC_MODE" ]; then
48
	/etc/init.d/apache2 force-reload
48
	invoke-rc.d apache2 force-reload
49
fi
49
fi
50
50
51
test -n "`grep "univention-apache v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-apache v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
51
test -n "`grep "univention-apache v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-apache v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
(-)a/branches/ucs-3.0/ucs/services/univention-apache/debian/univention-apache.postinst (-2 / +2 lines)
 Lines 82-90   fi Link Here 
82
82
83
if [ -x /etc/init.d/apache2 ]; then
83
if [ -x /etc/init.d/apache2 ]; then
84
	# better stop&start, as this behaves differently to restart
84
	# better stop&start, as this behaves differently to restart
85
	/etc/init.d/apache2 stop
85
	invoke-rc.d apache2 stop
86
	sleep 3
86
	sleep 3
87
	/etc/init.d/apache2 start
87
	invoke-rc.d apache2 start
88
fi
88
fi
89
89
90
exit 0
90
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-apache/univention/postinst (-1 / +1 lines)
 Lines 29-32    Link Here 
29
# /usr/share/common-licenses/AGPL-3; if not, see
29
# /usr/share/common-licenses/AGPL-3; if not, see
30
# <http://www.gnu.org/licenses/>.
30
# <http://www.gnu.org/licenses/>.
31
31
32
/etc/init.d/apache start
32
invoke-rc.d apache start
(-)a/branches/ucs-3.0/ucs/services/univention-apache/univention/preinst (-1 / +1 lines)
 Lines 30-33    Link Here 
30
# /usr/share/common-licenses/AGPL-3; if not, see
30
# /usr/share/common-licenses/AGPL-3; if not, see
31
# <http://www.gnu.org/licenses/>.
31
# <http://www.gnu.org/licenses/>.
32
32
33
/etc/init.d/apache stop || true
33
invoke-rc.d apache stop || true
(-)a/branches/ucs-3.0/ucs/services/univention-bind/90univention-bind-post.inst (-1 / +1 lines)
 Lines 119-125   if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then Link Here 
119
fi
119
fi
120
120
121
# Restart the bind9 daemon and wait for a few seconds
121
# Restart the bind9 daemon and wait for a few seconds
122
/etc/init.d/bind9 restart
122
invoke-rc.d bind9 restart
123
wait_for_dns
123
wait_for_dns
124
124
125
old=`univention-directory-manager policies/dhcp_dns list "$@" --filter cn=default-settings | grep domain_name_servers | sed -e 's|.*domain_name_servers: ||'`
125
old=`univention-directory-manager policies/dhcp_dns list "$@" --filter cn=default-settings | grep domain_name_servers | sed -e 's|.*domain_name_servers: ||'`
(-)a/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind-proxy.postinst (-4 / +4 lines)
 Lines 31-37    Link Here 
31
# <http://www.gnu.org/licenses/>.
31
# <http://www.gnu.org/licenses/>.
32
32
33
if [ -x /etc/init.d/bind9 ]; then
33
if [ -x /etc/init.d/bind9 ]; then
34
	/etc/init.d/bind9 stop
34
	invoke-rc.d bind9 stop
35
fi
35
fi
36
36
37
#DEBHELPER#
37
#DEBHELPER#
 Lines 39-45   fi Link Here 
39
univention-config-registry set nameserver/external?false
39
univention-config-registry set nameserver/external?false
40
40
41
if [ "$1" = "configure" -a -n "$2" ]; then
41
if [ "$1" = "configure" -a -n "$2" ]; then
42
	/etc/init.d/univention-bind-proxy crestart
42
	invoke-rc.d univention-bind-proxy crestart
43
else
43
else
44
	if [ "$1" = "configure" ]
44
	if [ "$1" = "configure" ]
45
		then
45
		then
 Lines 51-57   else Link Here 
51
		  count=$((count+1))
51
		  count=$((count+1))
52
		done
52
		done
53
		# runsv has 10 seconds to sync, if it hasn't there will be a warning
53
		# runsv has 10 seconds to sync, if it hasn't there will be a warning
54
		/etc/init.d/univention-bind-proxy start
54
		invoke-rc.d univention-bind-proxy start
55
	fi
55
	fi
56
fi
56
fi
57
57
 Lines 59-65   if [ "$1" = "configure" ] Link Here 
59
	then
59
	then
60
	if test -f /etc/init.d/univention-directory-listener
60
	if test -f /etc/init.d/univention-directory-listener
61
		then
61
		then
62
		/etc/init.d/univention-directory-listener crestart
62
		invoke-rc.d univention-directory-listener crestart
63
	fi
63
	fi
64
fi
64
fi
65
65
(-)a/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind.postinst (-3 / +3 lines)
 Lines 62-75   fi Link Here 
62
62
63
if [ "$1" = "configure" ]; then
63
if [ "$1" = "configure" ]; then
64
	if [ -n "$2" ]; then
64
	if [ -n "$2" ]; then
65
		/etc/init.d/bind9 crestart
65
		invoke-rc.d bind9 crestart
66
	else
66
	else
67
		echo "# add local zones here" >> /etc/bind/local.conf
67
		echo "# add local zones here" >> /etc/bind/local.conf
68
		echo "# add local zones here" >> /etc/bind/local.conf.proxy
68
		echo "# add local zones here" >> /etc/bind/local.conf.proxy
69
		echo "# add local zones here" >> /etc/bind/local.conf.samba4
69
		echo "# add local zones here" >> /etc/bind/local.conf.samba4
70
		/etc/init.d/bind9 start
70
		invoke-rc.d bind9 start
71
	fi
71
	fi
72
	/etc/init.d/univention-directory-listener crestart
72
	invoke-rc.d univention-directory-listener crestart
73
fi
73
fi
74
74
75
call_joinscript 05univention-bind.inst
75
call_joinscript 05univention-bind.inst
(-)a/branches/ucs-3.0/ucs/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind (-2 / +2 lines)
 Lines 42-48   if [ "$1" = "prechange" ] ; then Link Here 
42
		if /etc/init.d/bind9 status | grep -q "is running" ; then
42
		if /etc/init.d/bind9 status | grep -q "is running" ; then
43
			univention-config-registry set dns/bind9/stoppedbyserverpasswordchange=yes >/dev/null
43
			univention-config-registry set dns/bind9/stoppedbyserverpasswordchange=yes >/dev/null
44
			echo "stopping bind9 due to upcoming server password change" | logger -t "server-password-change"
44
			echo "stopping bind9 due to upcoming server password change" | logger -t "server-password-change"
45
			/etc/init.d/bind9 stop >/dev/null
45
			invoke-rc.d bind9 stop >/dev/null
46
		fi
46
		fi
47
	fi
47
	fi
48
fi
48
fi
 Lines 55-61   if [ "$1" = "postchange" ] ; then Link Here 
55
		# start bind9 only if it has been stopped by this script
55
		# start bind9 only if it has been stopped by this script
56
		if [ "$dns_bind9_stoppedbyserverpasswordchange" = "yes" ] ; then
56
		if [ "$dns_bind9_stoppedbyserverpasswordchange" = "yes" ] ; then
57
			echo "starting bind9 after server password change" | logger -t "server-password-change"
57
			echo "starting bind9 after server password change" | logger -t "server-password-change"
58
			/etc/init.d/bind9 start >/dev/null
58
			invoke-rc.d bind9 start >/dev/null
59
			univention-config-registry unset dns/bind9/stoppedbyserverpasswordchange >/dev/null
59
			univention-config-registry unset dns/bind9/stoppedbyserverpasswordchange >/dev/null
60
		fi
60
		fi
61
	fi
61
	fi
(-)a/branches/ucs-3.0/ucs/services/univention-dansguardian/debian/univention-dansguardian.postinst (-5 / +5 lines)
 Lines 38-44    Link Here 
38
ucr set squid/virusscan?yes
38
ucr set squid/virusscan?yes
39
ucr set squid/contentscan?yes
39
ucr set squid/contentscan?yes
40
40
41
/etc/init.d/squid3 restart
41
invoke-rc.d squid3 restart
42
42
43
eval "$(ucr shell squid/virusscan squid/contentscan)"
43
eval "$(ucr shell squid/virusscan squid/contentscan)"
44
44
 Lines 47-61   if [ "$squid_virusscan" = yes -o "$squid_contentscan" = yes ]; then Link Here 
47
	if [ -x /etc/init.d/clamav-freshclam ]; then
47
	if [ -x /etc/init.d/clamav-freshclam ]; then
48
		# if freshclam is active stop it for a second to avoid locking problem on /var/lib/clamav
48
		# if freshclam is active stop it for a second to avoid locking problem on /var/lib/clamav
49
		/etc/init.d/clamav-freshclam status | grep -q "is running" && freshclam_active=1
49
		/etc/init.d/clamav-freshclam status | grep -q "is running" && freshclam_active=1
50
		[ "$freshclam_active" = 1 ] && /etc/init.d/clamav-freshclam stop
50
		[ "$freshclam_active" = 1 ] && invoke-rc.d clamav-freshclam stop
51
	fi
51
	fi
52
	/etc/init.d/dansguardian restart
52
	invoke-rc.d dansguardian restart
53
	[ "$freshclam_active" = 1 ] && /etc/init.d/clamav-freshclam start
53
	[ "$freshclam_active" = 1 ] && invoke-rc.d clamav-freshclam start
54
fi
54
fi
55
55
56
call_joinscript 79univention-dansguardian.inst
56
call_joinscript 79univention-dansguardian.inst
57
57
58
/etc/init.d/univention-directory-listener crestart
58
invoke-rc.d univention-directory-listener crestart
59
59
60
# default group for web access
60
# default group for web access
61
ucr set dansguardian/groups?www-access
61
ucr set dansguardian/groups?www-access
(-)a/branches/ucs-3.0/ucs/services/univention-local-users/debian/univention-local-users.postinst (-1 / +1 lines)
 Lines 36-42   univention-config-registry set local-user-sync/passwd?true Link Here 
36
#DEBHELPER#
36
#DEBHELPER#
37
37
38
if [ -x /etc/init.d/univention-directory-listener ]; then
38
if [ -x /etc/init.d/univention-directory-listener ]; then
39
	/etc/init.d/univention-directory-listener crestart
39
	invoke-rc.d univention-directory-listener crestart
40
fi
40
fi
41
41
42
exit 0
42
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-net-installer/debian/postinst (-2 / +2 lines)
 Lines 54-60   call_joinscript 81univention-net-installer.inst Link Here 
54
54
55
if test -f /etc/init.d/univention-directory-listener
55
if test -f /etc/init.d/univention-directory-listener
56
	then
56
	then
57
	/etc/init.d/univention-directory-listener crestart
57
	invoke-rc.d univention-directory-listener crestart
58
fi
58
fi
59
59
60
exit 0
60
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-nfs/debian/postinst (-1 / +1 lines)
 Lines 61-67   ucr set security/packetfilter/package/univention-nfs/tcp/111/all="ACCEPT" \ Link Here 
61
if [ "$1" = "configure" ]; then
61
if [ "$1" = "configure" ]; then
62
	if test -f /etc/init.d/univention-directory-listener
62
	if test -f /etc/init.d/univention-directory-listener
63
		then
63
		then
64
		/etc/init.d/univention-directory-listener crestart
64
		invoke-rc.d univention-directory-listener crestart
65
	fi
65
	fi
66
fi
66
fi
67
67
(-)a/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst (-2 / +2 lines)
 Lines 68-74   if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontr Link Here 
68
fi
68
fi
69
69
70
if [ -x "/etc/init.d/univention-directory-listener" ]; then
70
if [ -x "/etc/init.d/univention-directory-listener" ]; then
71
  /etc/init.d/univention-directory-listener crestart
71
  invoke-rc.d univention-directory-listener crestart
72
fi
72
fi
73
73
74
if [ ! -e /var/log/univention/pkgdb.log ]; then
74
if [ ! -e /var/log/univention/pkgdb.log ]; then
 Lines 78-84   if [ ! -e /var/log/univention/pkgdb.log ]; then Link Here 
78
fi
78
fi
79
79
80
if [ -x "/etc/init.d/univention-management-console-server" ] ; then
80
if [ -x "/etc/init.d/univention-management-console-server" ] ; then
81
	/etc/init.d/univention-management-console-server crestart || true
81
	invoke-rc.d univention-management-console-server crestart || true
82
fi
82
fi
83
83
84
exit 0
84
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquota.postinst (-2 / +2 lines)
 Lines 44-56   chmod -R g+rw /etc/pykota Link Here 
44
dpkg-statoverride --update --add root root 700 /usr/share/pykota/cupspykota >/dev/null || true
44
dpkg-statoverride --update --add root root 700 /usr/share/pykota/cupspykota >/dev/null || true
45
45
46
adduser lp pykota
46
adduser lp pykota
47
/etc/init.d/cups restart
47
invoke-rc.d cups restart
48
48
49
univention-config-registry set pykota/policy/debug?1
49
univention-config-registry set pykota/policy/debug?1
50
50
51
if [ "$1" = "configure" ]; then
51
if [ "$1" = "configure" ]; then
52
	if test -f /etc/init.d/univention-directory-listener; then
52
	if test -f /etc/init.d/univention-directory-listener; then
53
	/etc/init.d/univention-directory-listener crestart
53
	invoke-rc.d univention-directory-listener crestart
54
	fi
54
	fi
55
fi
55
fi
56
56
(-)a/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquotadb.postinst (-3 / +3 lines)
 Lines 33-47    Link Here 
33
#DEBHELPER#
33
#DEBHELPER#
34
34
35
if [ -x /etc/init.d/postgresql ]; then
35
if [ -x /etc/init.d/postgresql ]; then
36
	/etc/init.d/postgresql reload
36
	invoke-rc.d postgresql reload
37
fi
37
fi
38
38
39
if [ -x /etc/init.d/postgresql-7.4 ]; then
39
if [ -x /etc/init.d/postgresql-7.4 ]; then
40
	/etc/init.d/postgresql-7.4 reload
40
	invoke-rc.d postgresql-7.4 reload
41
fi
41
fi
42
42
43
if [ -x /etc/init.d/postgresql-8.3 ]; then
43
if [ -x /etc/init.d/postgresql-8.3 ]; then
44
	/etc/init.d/postgresql-8.3 reload
44
	invoke-rc.d postgresql-8.3 reload
45
fi
45
fi
46
46
47
eval "$(univention-config-registry shell)"
47
eval "$(univention-config-registry shell)"
(-)a/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver-pdf.postinst (-1 / +1 lines)
 Lines 49-55   dpkg-statoverride --add --force --update root sys 4754 /usr/lib/cups/backend/cup Link Here 
49
if [ "$1" = "configure" ]; then
49
if [ "$1" = "configure" ]; then
50
        if test -f /etc/init.d/univention-directory-listener
50
        if test -f /etc/init.d/univention-directory-listener
51
                then
51
                then
52
                /etc/init.d/univention-directory-listener crestart
52
                invoke-rc.d univention-directory-listener crestart
53
        fi
53
        fi
54
fi
54
fi
55
55
(-)a/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver.postinst (-3 / +3 lines)
 Lines 62-68   fi Link Here 
62
if [ "$1" = "configure" ]; then
62
if [ "$1" = "configure" ]; then
63
	if test -f /etc/init.d/univention-directory-listener
63
	if test -f /etc/init.d/univention-directory-listener
64
		then
64
		then
65
		/etc/init.d/univention-directory-listener crestart
65
		invoke-rc.d univention-directory-listener crestart
66
	fi
66
	fi
67
67
68
fi
68
fi
 Lines 76-86   if [ ! -e "/etc/cups/classes.conf" ]; then Link Here 
76
fi
76
fi
77
77
78
if [ -x "/etc/init.d/cups" ]; then
78
if [ -x "/etc/init.d/cups" ]; then
79
	/etc/init.d/cups restart
79
	invoke-rc.d cups restart
80
fi
80
fi
81
81
82
if [ -x /etc/init.d/univention-management-console-server ]; then
82
if [ -x /etc/init.d/univention-management-console-server ]; then
83
	/etc/init.d/univention-management-console-server crestart
83
	invoke-rc.d univention-management-console-server crestart
84
fi
84
fi
85
85
86
exit 0
86
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-s4-connector/97univention-s4-connector.inst (-1 / +1 lines)
 Lines 97-103   else ## we are first system to provide this service Link Here 
97
97
98
fi
98
fi
99
99
100
/etc/init.d/univention-s4-connector restart
100
invoke-rc.d univention-s4-connector restart
101
101
102
## run 98univention-samba4-dns.inst to switch the dns/backend
102
## run 98univention-samba4-dns.inst to switch the dns/backend
103
call_joinscript 98univention-samba4-dns.inst
103
call_joinscript 98univention-samba4-dns.inst
(-)a/branches/ucs-3.0/ucs/services/univention-s4-connector/debian/univention-s4-connector.postinst (-2 / +2 lines)
 Lines 52-63   if [ ! -d /var/lib/univention-connector/s4 ]; then Link Here 
52
	chown 0.0 /var/lib/univention-connector/s4
52
	chown 0.0 /var/lib/univention-connector/s4
53
fi
53
fi
54
54
55
/etc/init.d/univention-directory-listener crestart || true
55
invoke-rc.d univention-directory-listener crestart || true
56
56
57
call_joinscript 97univention-s4-connector.inst
57
call_joinscript 97univention-s4-connector.inst
58
58
59
if [ -x /etc/init.d/univention-s4-connector ]; then
59
if [ -x /etc/init.d/univention-s4-connector ]; then
60
	/etc/init.d/univention-s4-connector restart
60
	invoke-rc.d univention-s4-connector restart
61
fi
61
fi
62
62
63
exit 0
63
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-samba/26univention-samba.inst (-8 / +8 lines)
 Lines 75-81   univention-config-registry set samba/autostart?yes Link Here 
75
# Stop the NFS Kernel Server
75
# Stop the NFS Kernel Server
76
nfsd_pid=`pidof nfsd`
76
nfsd_pid=`pidof nfsd`
77
if [ -n "$nfsd_pid" ]; then
77
if [ -n "$nfsd_pid" ]; then
78
	test -x /etc/init.d/nfs-kernel-server && /etc/init.d/nfs-kernel-server stop
78
	test -x /etc/init.d/nfs-kernel-server && invoke-rc.d nfs-kernel-server stop
79
fi
79
fi
80
80
81
winbind_was_running=0
81
winbind_was_running=0
 Lines 84-90   if [ -x /etc/init.d/winbind ]; then Link Here 
84
		winbind_was_running=1
84
		winbind_was_running=1
85
	fi
85
	fi
86
86
87
	/etc/init.d/winbind stop
87
	invoke-rc.d winbind stop
88
fi
88
fi
89
89
90
if [ "$server_role" = "domaincontroller_slave" -o "$server_role" = "memberserver" ]; then
90
if [ "$server_role" = "domaincontroller_slave" -o "$server_role" = "memberserver" ]; then
 Lines 100-106   if [ "$server_role" = "domaincontroller_slave" -o "$server_role" = "memberserver Link Here 
100
else
100
else
101
	univention-config-registry set	samba/user?"cn=admin,$ldap_base" \
101
	univention-config-registry set	samba/user?"cn=admin,$ldap_base" \
102
									samba/user/pwdfile?"/etc/ldap.secret"
102
									samba/user/pwdfile?"/etc/ldap.secret"
103
	/etc/init.d/samba restart >/dev/null 2>&1
103
	invoke-rc.d samba restart >/dev/null 2>&1
104
104
105
	smbpasswd -w $(cat /etc/ldap.secret)
105
	smbpasswd -w $(cat /etc/ldap.secret)
106
106
 Lines 113-119   fi Link Here 
113
eval "$(univention-config-registry shell samba/user/pwdfile samba/user)"
113
eval "$(univention-config-registry shell samba/user/pwdfile samba/user)"
114
114
115
# The samba server should be up and running for local join
115
# The samba server should be up and running for local join
116
/etc/init.d/samba restart
116
invoke-rc.d samba restart
117
sleep 3
117
sleep 3
118
118
119
# parse binddn and bindpwd from command line arguments into shell variables
119
# parse binddn and bindpwd from command line arguments into shell variables
 Lines 161-167   fi Link Here 
161
restart=0
161
restart=0
162
samba_pid=`pidof smbd`
162
samba_pid=`pidof smbd`
163
if [ -n "$samba_pid" ]; then
163
if [ -n "$samba_pid" ]; then
164
	/etc/init.d/samba stop >/dev/null 2>&1
164
	invoke-rc.d samba stop >/dev/null 2>&1
165
	killall smbd nmbd >/dev/null 2>&1
165
	killall smbd nmbd >/dev/null 2>&1
166
fi
166
fi
167
167
 Lines 189-202   if [ -n "$create_home_share" -a "$create_home_share" = "true" ]; then Link Here 
189
fi
189
fi
190
190
191
191
192
/etc/init.d/samba restart >/dev/null 2>&1
192
invoke-rc.d samba restart >/dev/null 2>&1
193
193
194
if [ -n "$nfsd_pid" ]; then
194
if [ -n "$nfsd_pid" ]; then
195
	test -x /etc/init.d/nfs-kernel-server && /etc/init.d/nfs-kernel-server start
195
	test -x /etc/init.d/nfs-kernel-server && invoke-rc.d nfs-kernel-server start
196
fi
196
fi
197
197
198
if [ $winbind_was_running -eq 1 ]; then
198
if [ $winbind_was_running -eq 1 ]; then
199
	/etc/init.d/winbind start >/dev/null 2>&1
199
	invoke-rc.d winbind start >/dev/null 2>&1
200
fi
200
fi
201
201
202
ucs_addServiceToLocalhost 'Samba 3' "$@"
202
ucs_addServiceToLocalhost 'Samba 3' "$@"
(-)a/branches/ucs-3.0/ucs/services/univention-samba/debian/postinst (-2 / +2 lines)
 Lines 132-143   if [ "$1" = "configure" ]; then Link Here 
132
			univention-config-registry set windows/wins-server?$ldap_master
132
			univention-config-registry set windows/wins-server?$ldap_master
133
		fi
133
		fi
134
	elif [ -n "$2" ]; then
134
	elif [ -n "$2" ]; then
135
		/etc/init.d/samba crestart
135
		invoke-rc.d samba crestart
136
	fi
136
	fi
137
137
138
138
139
	if test -f /etc/init.d/univention-directory-listener; then
139
	if test -f /etc/init.d/univention-directory-listener; then
140
		/etc/init.d/univention-directory-listener crestart
140
		invoke-rc.d univention-directory-listener crestart
141
	fi
141
	fi
142
fi
142
fi
143
143
(-)a/branches/ucs-3.0/ucs/services/univention-samba/debian/univention-samba-slave-pdc.postinst (-2 / +2 lines)
 Lines 39-47   univention-config-registry set windows/wins-support=yes \ Link Here 
39
39
40
if [ "$1" = "configure" ]; then
40
if [ "$1" = "configure" ]; then
41
	if [ -n "$2" ]; then
41
	if [ -n "$2" ]; then
42
		/etc/init.d/samba crestart
42
		invoke-rc.d samba crestart
43
	elif [ -x /etc/init.d/samba ]; then
43
	elif [ -x /etc/init.d/samba ]; then
44
		/etc/init.d/samba start
44
		invoke-rc.d samba start
45
	fi
45
	fi
46
fi
46
fi
47
47
(-)a/branches/ucs-3.0/ucs/services/univention-samba4/96univention-samba4.inst (-11 / +11 lines)
 Lines 141-155   univention-config-registry set samba/quota/command='None' # currently unsupporte Link Here 
141
141
142
## stop samba3 services and heimdal-kdc if present
142
## stop samba3 services and heimdal-kdc if present
143
if [ -x /etc/init.d/samba ]; then
143
if [ -x /etc/init.d/samba ]; then
144
	/etc/init.d/samba stop
144
	invoke-rc.d samba stop
145
	univention-config-registry set samba/autostart=no
145
	univention-config-registry set samba/autostart=no
146
fi
146
fi
147
if [ -x /etc/init.d/winbind ]; then
147
if [ -x /etc/init.d/winbind ]; then
148
	/etc/init.d/winbind stop
148
	invoke-rc.d winbind stop
149
	univention-config-registry set winbind/autostart=no
149
	univention-config-registry set winbind/autostart=no
150
fi
150
fi
151
if [ -x /etc/init.d/heimdal-kdc ]; then
151
if [ -x /etc/init.d/heimdal-kdc ]; then
152
	/etc/init.d/heimdal-kdc stop
152
	invoke-rc.d heimdal-kdc stop
153
	univention-config-registry set kerberos/autostart=no
153
	univention-config-registry set kerberos/autostart=no
154
fi
154
fi
155
155
 Lines 187-193   if [ "$samba4_role" = 'DC' ]; then Link Here 
187
	## check if we there already is a **domaincontroller** providing the service "Samba 4"
187
	## check if we there already is a **domaincontroller** providing the service "Samba 4"
188
	samba4servicedcs=$(ldapsearch -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret "(&(univentionService=${NAME})(objectClass=univentionDomainController))" cn | sed -n 's/^cn: \(.*\)/\1/p')	## currently there is no u-d-m module computers/dc
188
	samba4servicedcs=$(ldapsearch -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret "(&(univentionService=${NAME})(objectClass=univentionDomainController))" cn | sed -n 's/^cn: \(.*\)/\1/p')	## currently there is no u-d-m module computers/dc
189
189
190
	/etc/init.d/samba4 stop
190
	invoke-rc.d samba4 stop
191
191
192
	if [ -z "$samba4servicedcs" ]; then	## we are the first domainctontroller to provide this service
192
	if [ -z "$samba4servicedcs" ]; then	## we are the first domainctontroller to provide this service
193
193
 Lines 204-210   if [ "$samba4_role" = 'DC' ]; then Link Here 
204
		operatingSystem_attribute replace
204
		operatingSystem_attribute replace
205
205
206
		## Start samba daemon
206
		## Start samba daemon
207
		/etc/init.d/samba4 start
207
		invoke-rc.d samba4 start
208
208
209
	else	## otherwise we will simply join the new DC
209
	else	## otherwise we will simply join the new DC
210
210
 Lines 217-223   if [ "$samba4_role" = 'DC' ]; then Link Here 
217
				univention-config-registry set slapd/port/ldaps="$(remove_port "$slapd_port_ldaps" 636)"
217
				univention-config-registry set slapd/port/ldaps="$(remove_port "$slapd_port_ldaps" 636)"
218
			fi
218
			fi
219
219
220
			/etc/init.d/slapd crestart
220
			invoke-rc.d slapd crestart
221
			sleep 1
221
			sleep 1
222
		fi
222
		fi
223
223
 Lines 241-247   if [ "$samba4_role" = 'DC' ]; then Link Here 
241
		fi
241
		fi
242
242
243
		## Start samba daemon
243
		## Start samba daemon
244
		/etc/init.d/samba4 start
244
		invoke-rc.d samba4 start
245
245
246
		## set the predefined NTACL which the provision uses on sysvol
246
		## set the predefined NTACL which the provision uses on sysvol
247
		/usr/share/univention-samba4/scripts/set_sysvol_ntacl.py "$SYSVOL_PATH" 2>/dev/null
247
		/usr/share/univention-samba4/scripts/set_sysvol_ntacl.py "$SYSVOL_PATH" 2>/dev/null
 Lines 282-288   elif [ "$samba4_role" = "RODC" ]; then Link Here 
282
	samba4_ldap_base="DC=$(echo "$kerberos_realm" | sed 's/\./,DC=/g')"
282
	samba4_ldap_base="DC=$(echo "$kerberos_realm" | sed 's/\./,DC=/g')"
283
	univention-config-registry set samba4/ldap/base="$samba4_ldap_base"
283
	univention-config-registry set samba4/ldap/base="$samba4_ldap_base"
284
284
285
	/etc/init.d/samba4 stop
285
	invoke-rc.d samba4 stop
286
286
287
	if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then
287
	if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then
288
		## remove slapd from port 389 on upgrade
288
		## remove slapd from port 389 on upgrade
 Lines 293-299   elif [ "$samba4_role" = "RODC" ]; then Link Here 
293
			univention-config-registry set slapd/port/ldaps="$(remove_port "$slapd_port_ldaps" 636)"
293
			univention-config-registry set slapd/port/ldaps="$(remove_port "$slapd_port_ldaps" 636)"
294
		fi
294
		fi
295
295
296
		/etc/init.d/slapd crestart
296
		invoke-rc.d slapd crestart
297
		sleep 1
297
		sleep 1
298
	fi
298
	fi
299
299
 Lines 331-337   elif [ "$samba4_role" = "RODC" ]; then Link Here 
331
	fi
331
	fi
332
332
333
	## Start samba daemon
333
	## Start samba daemon
334
	/etc/init.d/samba4 start
334
	invoke-rc.d samba4 start
335
335
336
	## set the predefined NTACL which the provision uses on sysvol
336
	## set the predefined NTACL which the provision uses on sysvol
337
	/usr/share/univention-samba4/scripts/set_sysvol_ntacl.py "$SYSVOL_PATH"	2>/dev/null
337
	/usr/share/univention-samba4/scripts/set_sysvol_ntacl.py "$SYSVOL_PATH"	2>/dev/null
 Lines 364-370   fi Link Here 
364
## provision erases the idmap.ldb
364
## provision erases the idmap.ldb
365
/usr/lib/univention-directory-listener/system/samba4-idmap.py --direct-resync 2>/dev/null
365
/usr/lib/univention-directory-listener/system/samba4-idmap.py --direct-resync 2>/dev/null
366
366
367
/etc/init.d/samba4 restart
367
invoke-rc.d samba4 restart
368
368
369
ucs_addServiceToLocalhost "${NAME}" "$@"
369
ucs_addServiceToLocalhost "${NAME}" "$@"
370
370
(-)a/branches/ucs-3.0/ucs/services/univention-samba4/98univention-samba4-dns.inst (-1 / +1 lines)
 Lines 41-47   eval "$(univention-config-registry shell)" Link Here 
41
if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then
41
if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then
42
	univention-config-registry set dns/backend=samba4
42
	univention-config-registry set dns/backend=samba4
43
	if [ -x /etc/init.d/bind9 ]; then
43
	if [ -x /etc/init.d/bind9 ]; then
44
		/etc/init.d/bind9 restart
44
		invoke-rc.d bind9 restart
45
	fi
45
	fi
46
46
47
	# Wait until the local S4 contains the DNS record
47
	# Wait until the local S4 contains the DNS record
(-)a/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.postinst (-2 / +2 lines)
 Lines 119-132   if [ "$1" = "configure" ]; then Link Here 
119
		if [ -r /var/run/samba.pid ]; then
119
		if [ -r /var/run/samba.pid ]; then
120
			processname=$(ps -p $(cat /var/run/samba.pid) -o comm= )
120
			processname=$(ps -p $(cat /var/run/samba.pid) -o comm= )
121
			if [ "$processname" = 'samba' ]; then
121
			if [ "$processname" = 'samba' ]; then
122
				/etc/init.d/samba4 restart
122
				invoke-rc.d samba4 restart
123
			fi
123
			fi
124
		fi
124
		fi
125
125
126
	fi
126
	fi
127
127
128
	if test -f /etc/init.d/univention-directory-listener; then
128
	if test -f /etc/init.d/univention-directory-listener; then
129
		/etc/init.d/univention-directory-listener crestart
129
		invoke-rc.d univention-directory-listener crestart
130
	fi
130
	fi
131
fi
131
fi
132
132
(-)a/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.prerm (-1 / +1 lines)
 Lines 58-64   if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then Link Here 
58
	fi
58
	fi
59
59
60
	if [ -x /etc/init.d/slapd ]; then
60
	if [ -x /etc/init.d/slapd ]; then
61
		/etc/init.d/slapd restart
61
		invoke-rc.d slapd restart
62
	fi
62
	fi
63
		
63
		
64
fi
64
fi
(-)a/branches/ucs-3.0/ucs/services/univention-samba4/scripts/setup-s4.sh (-6 / +6 lines)
 Lines 114-135   fi Link Here 
114
114
115
## restart processes with adjusted ports
115
## restart processes with adjusted ports
116
stop_udm_cli_server
116
stop_udm_cli_server
117
/etc/init.d/slapd restart 2>&1 | tee -a "$LOGFILE"
117
invoke-rc.d slapd restart 2>&1 | tee -a "$LOGFILE"
118
/etc/init.d/univention-directory-listener restart 2>&1 | tee -a "$LOGFILE"
118
invoke-rc.d univention-directory-listener restart 2>&1 | tee -a "$LOGFILE"
119
/etc/init.d/univention-management-console-server restart 2>&1 | tee -a "$LOGFILE"
119
invoke-rc.d univention-management-console-server restart 2>&1 | tee -a "$LOGFILE"
120
120
121
## Provision Samba4
121
## Provision Samba4
122
eval "$(univention-config-registry shell)"
122
eval "$(univention-config-registry shell)"
123
123
124
if [ -x /etc/init.d/samba ]; then
124
if [ -x /etc/init.d/samba ]; then
125
	/etc/init.d/samba stop 2>&1 | tee -a "$LOGFILE"
125
	invoke-rc.d samba stop 2>&1 | tee -a "$LOGFILE"
126
fi
126
fi
127
if [ -x /etc/init.d/winbind ]; then
127
if [ -x /etc/init.d/winbind ]; then
128
	/etc/init.d/winbind stop 2>&1 | tee -a "$LOGFILE"
128
	invoke-rc.d winbind stop 2>&1 | tee -a "$LOGFILE"
129
fi
129
fi
130
univention-config-registry set samba/autostart=no winbind/autostart=no 2>&1 | tee -a "$LOGFILE"
130
univention-config-registry set samba/autostart=no winbind/autostart=no 2>&1 | tee -a "$LOGFILE"
131
131
132
/etc/init.d/heimdal-kdc stop 2>&1 | tee -a "$LOGFILE"
132
invoke-rc.d heimdal-kdc stop 2>&1 | tee -a "$LOGFILE"
133
univention-config-registry set kerberos/autostart=no 2>&1 | tee -a "$LOGFILE"
133
univention-config-registry set kerberos/autostart=no 2>&1 | tee -a "$LOGFILE"
134
134
135
if [ ! -e /usr/modules ]; then
135
if [ ! -e /usr/modules ]; then
(-)a/branches/ucs-3.0/ucs/services/univention-sasl/debian/univention-sasl.postinst (-1 / +1 lines)
 Lines 34-40   eval "$(ucr shell)" Link Here 
34
univention-config-registry set mail/saslauthd/threads?5
34
univention-config-registry set mail/saslauthd/threads?5
35
35
36
if [ -x /etc/init.d/saslauthd ]; then
36
if [ -x /etc/init.d/saslauthd ]; then
37
	/etc/init.d/saslauthd restart
37
	invoke-rc.d saslauthd restart
38
fi
38
fi
39
39
40
#DEBHELPER#
40
#DEBHELPER#
(-)a/branches/ucs-3.0/ucs/services/univention-shares/debian/postinst (-1 / +1 lines)
 Lines 37-43    Link Here 
37
create_logfile_if_missing /var/log/univention/share-replication.log "root:adm" 640
37
create_logfile_if_missing /var/log/univention/share-replication.log "root:adm" 640
38
38
39
if [ "$1" = "configure" -a -n "$2" ]; then
39
if [ "$1" = "configure" -a -n "$2" ]; then
40
	/etc/init.d/univention-directory-listener crestart
40
	invoke-rc.d univention-directory-listener crestart
41
fi
41
fi
42
42
43
exit 0
43
exit 0
(-)a/branches/ucs-3.0/ucs/services/univention-squid/debian/univention-squid.postinst (-2 / +2 lines)
 Lines 62-69   cp /etc/machine.secret "$dest" Link Here 
62
chown proxy:root "$dest"
62
chown proxy:root "$dest"
63
chmod 600  "$dest"
63
chmod 600  "$dest"
64
64
65
/etc/init.d/squid3 stop
65
invoke-rc.d squid3 stop
66
/etc/init.d/squid3 start
66
invoke-rc.d squid3 start
67
67
68
# configure firewall
68
# configure firewall
69
ucr set security/packetfilter/package/univention-squid/tcp/3128/all="ACCEPT" \
69
ucr set security/packetfilter/package/univention-squid/tcp/3128/all="ACCEPT" \
(-)a/branches/ucs-3.0/ucs/services/univention-tftp/debian/univention-tftp.postinst (-2 / +2 lines)
 Lines 33-46    Link Here 
33
. /usr/share/univention-lib/all.sh
33
. /usr/share/univention-lib/all.sh
34
34
35
if [ -e "/etc/init.d/atftpd" ]; then
35
if [ -e "/etc/init.d/atftpd" ]; then
36
	/etc/init.d/atftpd stop
36
	invoke-rc.d atftpd stop
37
fi;
37
fi;
38
38
39
update-inetd --group BOOT --remove "tftp"
39
update-inetd --group BOOT --remove "tftp"
40
update-inetd --group BOOT --add "tftp               dgram   udp     wait \
40
update-inetd --group BOOT --add "tftp               dgram   udp     wait \
41
        nobody /usr/sbin/tcpd /usr/sbin/in.tftpd --tftpd-timeout 300 --retry-timeout 5 --maxthread 100 --verbose=5  /var/lib/univention-client-boot/"
41
        nobody /usr/sbin/tcpd /usr/sbin/in.tftpd --tftpd-timeout 300 --retry-timeout 5 --maxthread 100 --verbose=5  /var/lib/univention-client-boot/"
42
42
43
/etc/init.d/atftpd start
43
invoke-rc.d atftpd start
44
44
45
remove_ucr_template /etc/default/atftpd.conf
45
remove_ucr_template /etc/default/atftpd.conf
46
46
(-)a/branches/ucs-3.0/ucs/virtualization/xen-4.1/debian/xen-4.1.postinst (-7 / +3 lines)
 Lines 6-21    Link Here 
6
6
7
# restart udev
7
# restart udev
8
if [ -x /etc/init.d/udev ]; then
8
if [ -x /etc/init.d/udev ]; then
9
	/etc/init.d/udev restart
9
	invoke-rc.d udev restart
10
fi
10
fi
11
11
12
if [ -x "/etc/init.d/xend" ]; then
12
if [ -x "/etc/init.d/xend" ]; then
13
        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
13
	invoke-rc.d xend stop || exit $?
14
                invoke-rc.d xend stop || exit $?
14
	update-rc.d -f xend remove >/dev/null
15
        else
16
                /etc/init.d/xend stop || exit $?
17
        fi
18
        update-rc.d -f xend remove >/dev/null
19
fi
15
fi
20
16
21
if [ -x "/etc/init.d/xendomains" ]; then
17
if [ -x "/etc/init.d/xendomains" ]; then

Return to bug 18497