View | Details | Raw Unified | Return to bug 17915 | Differences between
and this patch

Collapse All | Expand All

(-)debian/control (-5 / +13 lines)
 Lines 2-15    Link Here 
2
Section: univention
2
Section: univention
3
Priority: optional
3
Priority: optional
4
Maintainer: Univention GmbH <packages@univention.de>
4
Maintainer: Univention GmbH <packages@univention.de>
5
Build-Depends: debhelper, univention-config-dev, python2.4, python-all-dev, python-central
5
Build-Depends: debhelper,
6
 univention-config-dev,
7
 python2.4,
8
 python-all-dev,
9
 python-central
6
Standards-Version: 3.7.2
10
Standards-Version: 3.7.2
7
XS-Python-Version: 2.4
11
XS-Python-Version: 2.4
8
12
9
Package: univention-directory-manager-module-example
13
Package: univention-directory-manager-module-example
10
Architecture: all
14
Architecture: all
11
Depends: univention-config-registry, univention-directory-manager-tools, univention-directory-manager-module-example-schema
15
Depends: univention-config-registry,
12
XB-Python-Version: 2.4
16
 univention-directory-manager-tools,
17
 ${misc:Depends}, ${python:Depends}
18
Recommends: univention-directory-manager-module-example-schema,
19
XB-Python-Version: ${python:Versions}
13
Description: Univention Directory Manager example module to manage IP phones
20
Description: Univention Directory Manager example module to manage IP phones
14
 This package contains an Univention Directory Manager module that
21
 This package contains an Univention Directory Manager module that
15
 demonstrates how custom LDAP objects can be managed with the
22
 demonstrates how custom LDAP objects can be managed with the
 Lines 17-26    Link Here 
17
24
18
Package: univention-directory-manager-module-example-schema
25
Package: univention-directory-manager-module-example-schema
19
Architecture: all
26
Architecture: all
20
Depends: univention-config-registry, univention-directory-manager-tools
27
Depends: univention-config-registry,
21
XB-Python-Version: 2.4
28
 ${misc:Depends}
22
Description: Univention Directory Manager example module to manage IP phones
29
Description: Univention Directory Manager example module to manage IP phones
23
 This package contains the LDAP-schema for univention-directory-manager-module-example.
30
 This package contains the LDAP-schema for univention-directory-manager-module-example.
31
 .
24
 It needs to be installed on the DC Master to be available for LDAP operations,
32
 It needs to be installed on the DC Master to be available for LDAP operations,
25
 and is strongly recommended to be installed in the DC Backup to be available
33
 and is strongly recommended to be installed in the DC Backup to be available
26
 in case the DC Backup has to replace the DC Master (univention-backup2master).
34
 in case the DC Backup has to replace the DC Master (univention-backup2master).
(-)debian/postinst (-4 lines)
 Lines 1-4    Link Here 
1
#!/bin/sh
2
3
#DEBHELPER#
4
(-)debian/rules (-5 / +6 lines)
 Lines 16-30    Link Here 
16
# This has to be exported to make some magic below work.
16
# This has to be exported to make some magic below work.
17
#export DH_OPTIONS
17
#export DH_OPTIONS
18
18
19
PYVERS=$(shell pyversions -vr)
19
PYVERS := $(shell pyversions -vr)
20
D=debian/univention-directory-manager-module-example
20
D  := debian/univention-directory-manager-module-example
21
DS=debian/univention-directory-manager-module-example-schema
21
DS := debian/univention-directory-manager-module-example-schema
22
22
23
build:
23
build:
24
24
25
clean:
25
clean:
26
	dh_testdir
26
	dh_testdir
27
	dh_clean
27
	dh_clean
28
	$(RM) debian/*.conffiles
28
29
29
install: build
30
install: build
30
	dh_testdir
31
	dh_testdir
 Lines 34-41    Link Here 
34
35
35
	univention-install-config-registry
36
	univention-install-config-registry
36
	install -m 0644 schema/ip-phone.schema ${DS}/usr/share/univention-ldap/schema/
37
	install -m 0644 schema/ip-phone.schema ${DS}/usr/share/univention-ldap/schema/
37
	install -m 0644 modules/ip_phone.py ${D}/usr/lib/python2.4/site-packages/univention/admin/handlers/test/
38
	install -m 0644 modules/ip_phone.py ${D}/usr/share/pyshared/univention/admin/handlers/test/
38
	install -m 0644 modules/__init__.py ${D}/usr/lib/python2.4/site-packages/univention/admin/handlers/test/
39
	install -m 0644 modules/__init__.py ${D}/usr/share/pyshared/univention/admin/handlers/test/
39
	install -m 0755 scripts/ip-phone-tool ${D}/usr/sbin/
40
	install -m 0755 scripts/ip-phone-tool ${D}/usr/sbin/
40
41
41
	dh_install --exclude=".svn"
42
	dh_install --exclude=".svn"
(-)debian/univention-directory-manager-module-example.univention-config-registry (-5 lines)
 Lines 1-5    Link Here 
1
Type: subfile
2
Multifile: etc/ldap/slapd.conf
3
Subfile: etc/ldap/slapd.conf.d/11univention-ip-phone_schema
4
Variables: ldap/server/type
5
Variables: ldap/master
(-)debian/univention-directory-manager-module-example.conffiles (-1 lines)
Line 1    Link Here 
1
/etc/univention/templates/files/etc/ldap/slapd.conf.d/11univention-ip-phone_schema
(-)debian/dirs (-1 / +1 lines)
 Lines 1-2    Link Here 
1
usr/lib/python2.4/site-packages/univention/admin/handlers/test/
1
usr/share/pyshared/univention/admin/handlers/test/
2
usr/sbin/
2
usr/sbin/
(-)debian/univention-directory-manager-module-example-schema.postinst (+24 lines)
Line 0    Link Here 
1
#!/bin/sh
2
set -e
3
4
#DEBHELPER#
5
6
case "$1" in
7
configure)
8
	case "$(/usr/sbin/univention-config-registry get server/role)" in
9
	domaincontroller_master)
10
		invoke-rc.d slapd restart
11
		;;
12
	esac
13
	;;
14
15
abort-upgrade|abort-remove|abort-deconfigure)
16
	;;
17
18
*)
19
	echo "postinst called with unknown argument \`$1'" >&2
20
	exit 1
21
	;;
22
esac
23
24
:
(-)debian/univention-directory-manager-module-example-schema.postrm (+20 lines)
Line 0    Link Here 
1
#!/bin/sh
2
set -e
3
4
#DEBHELPER#
5
6
case "$1" in
7
remove)
8
	/usr/sbin/univention-config-registry commit /etc/ldap/slapd.conf
9
	;;
10
11
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
12
	;;
13
14
*)
15
	echo "postrm called with unknown argument \`$1'" >&2
16
	exit 1
17
	;;
18
esac
19
20
:
(-)debian/univention-directory-manager-module-example.postinst (+8 lines)
Line 0    Link Here 
1
#!/bin/sh
2
set -e
3
4
#DEBHELPER#
5
6
pkill -f "python.\.. /usr/share/univention-directory-manager-tools/univention-cli-server" || true
7
8
:
(-)debian/conffiles (-1 lines)
Line 1    Link Here 
1
/etc/univention/templates/files/etc/ldap/slapd.conf.d/11univention-ip-phone_schema
(-)debian/copyright (-1 / +1 lines)
 Lines 1-4    Link Here 
1
Copyright 2005-2010 Univention GmbH
1
Copyright 2005-2011 Univention GmbH
2
2
3
http://www.univention.de/
3
http://www.univention.de/
4
4
(-)scripts/ip-phone-tool (-1 / +1 lines)
 Lines 222-227    Link Here 
222
			parser.print_usage()
222
			parser.print_usage()
223
			sys.exit(1)
223
			sys.exit(1)
224
		udm_ipphone.clear_redirect( arguments[1] )
224
		udm_ipphone.clear_redirect( arguments[1] )
225
	else:		
225
	else:
226
		parser.print_usage()
226
		parser.print_usage()
227
		sys.exit(0)
227
		sys.exit(0)
(-)conffiles/ldap/slapd.conf.d/11univention-ip-phone_schema (-2 / +4 lines)
 Lines 1-5    Link Here 
1
@!@
1
@!@
2
if configRegistry['ldap/server/type']=='master':
2
import os.path
3
	print 'include         /usr/share/univention-ldap/schema/ip-phone.schema'
3
schema = '/usr/share/univention-ldap/schema/ip-phone.schema'
4
if configRegistry['ldap/server/type'] == 'master' and os.path.exists(schema):
5
	print 'include         %s' % schema
4
@!@
6
@!@
5
7

Return to bug 17915