Repository: bigtop Updated Branches: refs/heads/master c39701234 -> bf67f6e5b
BIGTOP-2097. cleaning up the ignite-service Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/bf67f6e5 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/bf67f6e5 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/bf67f6e5 Branch: refs/heads/master Commit: bf67f6e5bf72934c577f2eeaabe063aff3a9ca99 Parents: c397012 Author: Olaf Flebbe <[email protected]> Authored: Tue Oct 27 22:17:00 2015 +0100 Committer: Konstantin Boudnik <[email protected]> Committed: Sun Nov 1 11:34:05 2015 -0800 ---------------------------------------------------------------------- .../modules/ignite_hadoop/manifests/init.pp | 2 +- .../src/common/ignite-hadoop/ignite-hadoop.svc | 4 +- bigtop-packages/src/deb/ignite-hadoop/compat | 2 +- .../deb/ignite-hadoop/ignite-hadoop-doc.dirs | 2 +- .../deb/ignite-hadoop/ignite-hadoop-doc.install | 1 - .../src/deb/ignite-hadoop/ignite-hadoop.dirs | 1 - .../deb/ignite-hadoop/install_init_scripts.sh | 30 ------------ bigtop-packages/src/deb/ignite-hadoop/rules | 3 +- .../src/deb/ignite-hadoop/service-postinst.tpl | 51 -------------------- .../src/deb/ignite-hadoop/service-postrm.tpl | 51 -------------------- .../rpm/ignite-hadoop/SPECS/ignite-hadoop.spec | 12 ++--- 11 files changed, 9 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-deploy/puppet/modules/ignite_hadoop/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/ignite_hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/ignite_hadoop/manifests/init.pp index 2baf22e..ffe7db3 100644 --- a/bigtop-deploy/puppet/modules/ignite_hadoop/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/ignite_hadoop/manifests/init.pp @@ -74,7 +74,7 @@ class ignite_hadoop { require => [Package["ignite-hadoop-service"]], } - service { "ignite-hadoop": + service { "ignite-hadoop-service": ensure => running, require => [ Package["ignite-hadoop", "ignite-hadoop-service"], File["/etc/default/ignite-hadoop"] ], subscribe => [ Package["ignite-hadoop"], File["/etc/default/ignite-hadoop", "/etc/ignite-hadoop/conf/default-config.xml"] ] http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/common/ignite-hadoop/ignite-hadoop.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ignite-hadoop/ignite-hadoop.svc b/bigtop-packages/src/common/ignite-hadoop/ignite-hadoop.svc index 417462e..233fc1b 100644 --- a/bigtop-packages/src/common/ignite-hadoop/ignite-hadoop.svc +++ b/bigtop-packages/src/common/ignite-hadoop/ignite-hadoop.svc @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -DAEMON="@IGNITE_DAEMON@" -DESC="@IGNITE_DAEMON@ daemon" +DAEMON="ignite-hadoop" +DESC="ignite-hadoop daemon" EXEC_PATH="\${IGNITE_HOME}/bin/include/service.sh" SVC_USER="ignite" PIDFILE="\${IGNITE_PID_DIR}/${DAEMON}.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/compat ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/compat b/bigtop-packages/src/deb/ignite-hadoop/compat index 7f8f011..ec63514 100644 --- a/bigtop-packages/src/deb/ignite-hadoop/compat +++ b/bigtop-packages/src/deb/ignite-hadoop/compat @@ -1 +1 @@ -7 +9 http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.dirs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.dirs b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.dirs index 24049ad..0e81ae2 100644 --- a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.dirs +++ b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.dirs @@ -1 +1 @@ -/usr/share/doc/ignite-hadoop-doc/ +/usr/share/docs/ignite-hadoop-docs http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.install b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.install deleted file mode 100644 index 37554f7..0000000 --- a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop-doc.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/ignite-hadoop-doc http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.dirs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.dirs b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.dirs index 75823e6..aa0ebd3 100644 --- a/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.dirs +++ b/bigtop-packages/src/deb/ignite-hadoop/ignite-hadoop.dirs @@ -1,4 +1,3 @@ /usr/bin /var/log/ignite-hadoop -/var/run/ignite-hadoop /etc/default http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/install_init_scripts.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/install_init_scripts.sh b/bigtop-packages/src/deb/ignite-hadoop/install_init_scripts.sh deleted file mode 100644 index 6bb2775..0000000 --- a/bigtop-packages/src/deb/ignite-hadoop/install_init_scripts.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -SRC_PKG=ignite-hadoop - -service_pkgdir=debian/$SRC_PKG -debdir=$service_pkgdir/DEBIAN -mkdir -p $service_pkgdir/etc/init.d/ $debdir -sed -i -e "s|@IGNITE_DAEMON@|ignite-hadoop|" debian/ignite-hadoop.svc -echo bash debian/init.d.tmpl debian/ignite-hadoop.svc deb $service_pkgdir/etc/init.d/$SRC_PKG -bash debian/init.d.tmpl debian/ignite-hadoop.svc deb $service_pkgdir/etc/init.d/$SRC_PKG - -sed -e "s|@IGNITE_DAEMON@|ignite-hadoop|" debian/service-postinst.tpl > $debdir/postinst -sed -e "s|@IGNITE_DAEMON@|ignite-hadoop|" debian/service-postrm.tpl > $debdir/postrm -echo /etc/init.d/$SRC_PKG > $debdir/conffiles -chmod 755 $debdir/postinst $debdir/postrm $service_pkgdir/etc/init.d* http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/rules b/bigtop-packages/src/deb/ignite-hadoop/rules index 817fd24..e6e9224 100644 --- a/bigtop-packages/src/deb/ignite-hadoop/rules +++ b/bigtop-packages/src/deb/ignite-hadoop/rules @@ -43,5 +43,4 @@ override_dh_auto_install: --prefix=debian/tmp ln -s /var/log/${ignite-hadoop_pkg_name} debian/tmp/usr/lib/${ignite-hadoop_pkg_name}/logs ln -s /var/run/${ignite-hadoop_pkg_name} debian/tmp/usr/lib/${ignite-hadoop_pkg_name}/pids - - bash debian/install_init_scripts.sh + bash debian/init.d.tmpl debian/ignite-hadoop.svc deb debian/${ignite-hadoop_pkg_name}-service.init http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/service-postinst.tpl ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/service-postinst.tpl b/bigtop-packages/src/deb/ignite-hadoop/service-postinst.tpl deleted file mode 100644 index d7d372e..0000000 --- a/bigtop-packages/src/deb/ignite-hadoop/service-postinst.tpl +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# postinst script for ignite-hadoop -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <postinst> `abort-remove' -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - update-rc.d @IGNITE_DAEMON@ defaults >/dev/null || exit 1 - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/deb/ignite-hadoop/service-postrm.tpl ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ignite-hadoop/service-postrm.tpl b/bigtop-packages/src/deb/ignite-hadoop/service-postrm.tpl deleted file mode 100644 index 321f996..0000000 --- a/bigtop-packages/src/deb/ignite-hadoop/service-postrm.tpl +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# postrm script for ignite-hadoop -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <overwriter> -# <overwriter-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge) - update-rc.d -f @IGNITE_DAEMON@ remove > /dev/null || exit 1 - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 http://git-wip-us.apache.org/repos/asf/bigtop/blob/bf67f6e5/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec b/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec index 82219b5..b8adb09 100644 --- a/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec +++ b/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec @@ -22,7 +22,6 @@ %define pids_ignite %{ignite_home}/pids %define man_dir %{_mandir} %define ignite_username ignite -%define ignite_services ignite-hadoop %define vcs_tag %{ignite_hadoop_version} %if %{?suse_version:1}0 @@ -161,14 +160,9 @@ ln -s %{_localstatedir}/log/%{name} %{buildroot}/%{logs_ignite} %__install -d -m 0755 %{buildroot}/%{_localstatedir}/run/%{name} ln -s %{_localstatedir}/run/%{name} %{buildroot}/%{pids_ignite} -for service in %{ignite_services} -do - init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name} - %__sed -e "s|@IGNITE_DAEMON@|${service}|" %{SOURCE3} > ${RPM_SOURCE_DIR}/ignite.node - bash %{SOURCE4} ${RPM_SOURCE_DIR}/ignite.node rpm $init_file - - chmod 755 $init_file -done +init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name} +bash %{SOURCE4} ${RPM_SOURCE_DIR}/ignite.svc rpm $init_file +chmod 755 $init_file %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
