From 3e98f08850fd3b25357e1d14e5b4c2d5f6ebc34e Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 14 Nov 2012 10:25:30 -0500 Subject: add "status" command to bcfg2 init scripts --- debian/bcfg2.init | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) mode change 100644 => 100755 debian/bcfg2.init (limited to 'debian') diff --git a/debian/bcfg2.init b/debian/bcfg2.init old mode 100644 new mode 100755 index add840c90..4f83adbf6 --- a/debian/bcfg2.init +++ b/debian/bcfg2.init @@ -70,16 +70,17 @@ start () { case "$1" in start) start - ;; - stop) + ;; + stop|status) exit 0 - ;; + ;; restart|force-reload) start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" - exit 1 + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload}" + exit 1 + ;; esac exit 0 -- cgit v1.2.3-1-g7c22 From e0dfe01c7b0c1cfdb462ebe2663b9f95f9035e87 Mon Sep 17 00:00:00 2001 From: Arto Jantunen Date: Thu, 15 Nov 2012 12:15:11 -0600 Subject: Include debian upgrade tools in packaging Signed-off-by: Sol Jerome --- debian/bcfg2-server.examples | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/bcfg2-server.examples (limited to 'debian') diff --git a/debian/bcfg2-server.examples b/debian/bcfg2-server.examples new file mode 100644 index 000000000..98ec4b785 --- /dev/null +++ b/debian/bcfg2-server.examples @@ -0,0 +1 @@ +tools/upgrade -- cgit v1.2.3-1-g7c22 From 1d3bc1087e65d906f4ef20f72f394ca8d35b078d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Nov 2012 12:20:34 -0600 Subject: debian: Sync some upstream changes These are changes from Arto Jantunen's git branch located at git://anonscm.debian.org/git/collab-maint/bcfg2.git. Signed-off-by: Sol Jerome --- debian/bcfg2-doc.docs | 1 + debian/bcfg2-doc.links | 1 - debian/control | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 debian/bcfg2-doc.docs delete mode 100644 debian/bcfg2-doc.links (limited to 'debian') diff --git a/debian/bcfg2-doc.docs b/debian/bcfg2-doc.docs new file mode 100644 index 000000000..6f7511e54 --- /dev/null +++ b/debian/bcfg2-doc.docs @@ -0,0 +1 @@ +build/sphinx/html diff --git a/debian/bcfg2-doc.links b/debian/bcfg2-doc.links deleted file mode 100644 index 133a58e2e..000000000 --- a/debian/bcfg2-doc.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/bcfg2/html/_sources usr/share/doc/bcfg2/rst diff --git a/debian/control b/debian/control index 28ddbf9aa..be03f4942 100644 --- a/debian/control +++ b/debian/control @@ -42,9 +42,9 @@ Description: Configuration management web interface bcfg2-web is the reporting server for bcfg2. Package: bcfg2-doc +Section: doc Architecture: all Depends: ${sphinxdoc:Depends}, ${misc:Depends} -XB-Python-Version: >= 2.4 Description: Configuration management system documentation Bcfg2 is a configuration management system that generates configuration sets for clients bound by client profiles. -- cgit v1.2.3-1-g7c22 From 672c2751153dcd9e53de7f82d11be81cc37a7278 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Nov 2012 12:26:40 -0600 Subject: debian: Add NEWS file from Arto's upstream repo Signed-off-by: Sol Jerome --- debian/NEWS | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 debian/NEWS (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..7f99a8eb7 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,16 @@ +bcfg2 (1.1.0-1) unstable; urgency=low + + Due to repository changes made to support Path entries it is recommended + to upgrade the clients before upgrading the server. After that, you can + use the posixunified.py script (included as an example in the server + package) to convert your repository. + + -- Arto Jantunen Fri, 05 Nov 2010 19:07:59 +0200 + +bcfg2 (1.0.1-1) unstable; urgency=low + + Since version 1.0, Bcfg2 no longer supports agent mode. Please update your + configuration accordingly if you were using it. + + -- Arto Jantunen Tue, 03 Aug 2010 12:28:54 +0300 + -- cgit v1.2.3-1-g7c22 From 8df798d04249f481f7a7f82ca09c9a67a92f5699 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Nov 2012 12:30:11 -0600 Subject: debian: Apply init script fixes from Arto's repo Signed-off-by: Sol Jerome --- debian/bcfg2-server.init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init index a1fa65d14..8de16b9b5 100755 --- a/debian/bcfg2-server.init +++ b/debian/bcfg2-server.init @@ -7,13 +7,13 @@ # ### BEGIN INIT INFO # Provides: bcfg2-server -# Required-Start: $network $remote_fs $named -# Required-Stop: $network $remote_fs $named +# Required-Start: $network $remote_fs $named $syslog +# Required-Stop: $network $remote_fs $named $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Configuration management Server -# Description: Bcfg2 is a configuration management system that builds -# installs configuration files served by bcfg2-server +# Description: The server component of the Bcfg2 configuration management +# system ### END INIT INFO # Include lsb functions -- cgit v1.2.3-1-g7c22 From 198890a1bfd504303eea8797ff4d38660e9cc462 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Nov 2012 15:04:34 -0600 Subject: debian: Fix docs package (from Arto Jantunen) Signed-off-by: Sol Jerome --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 30fd64a43..1df51a79c 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,9 @@ override_dh_installinit: # Install bcfg2-server initscript without starting it on postinst dh_installinit --package=bcfg2-server --no-start -override_dh_installdocs: +override_dh_autobuild: + dh_autobuild python setup.py build_sphinx - dh_installdocs build/sphinx/html override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3-1-g7c22 From 73f8c32761adad1be33e62af5203d12db5e2dfb9 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Nov 2012 15:57:24 -0600 Subject: debian: Fix typo Signed-off-by: Sol Jerome --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 1df51a79c..975b6ce64 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ override_dh_installinit: dh_installinit --package=bcfg2-server --no-start override_dh_autobuild: - dh_autobuild + dh_auto_build python setup.py build_sphinx override_dh_auto_clean: -- cgit v1.2.3-1-g7c22 From 6b289ac1814e0ff450876e6575a621902a78b381 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Nov 2012 15:59:38 -0600 Subject: debian: Fix one more typo Signed-off-by: Sol Jerome --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 975b6ce64..fcbf6346c 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_installinit: # Install bcfg2-server initscript without starting it on postinst dh_installinit --package=bcfg2-server --no-start -override_dh_autobuild: +override_dh_auto_build: dh_auto_build python setup.py build_sphinx -- cgit v1.2.3-1-g7c22