test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-29 18:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整acl 支持systemd的master.service，请check下

Browse Source
This commit is contained in:
ci 2022-06-15 17:08:18 +08:00
parent f496ab0202
commit 8fdcf2d139
4 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -210,3 +210,10 @@ frame_release:centos7.2:
"docker-registry.qiyi.virtual/acl/centos-builder:7.2" "docker-registry.qiyi.virtual/acl/centos-builder:7.2"
} }
<<: *FRAME_RELEASE <<: *FRAME_RELEASE
frame_release:centos8.2:
variables: {
BUILDIMAGES:
"docker-registry.qiyi.virtual/acl/centos-builder:8.2"
}
<<: *FRAME_RELEASE

4
dist/master/init.d/master vendored
View File

@ -29,8 +29,8 @@ LOG_PATH=$HOME_PATH/var/log/acl_master
lockfile=/var/lock/subsys/acl_master lockfile=/var/lock/subsys/acl_master
# Source function library. # Source function library.
# don't use systemd --zsx # use systemd
SYSTEMCTL_SKIP_REDIRECT=1 # SYSTEMCTL_SKIP_REDIRECT=1
. /etc/rc.d/init.d/functions . /etc/rc.d/init.d/functions
# A function to find the pid of a program. Looks *only* at the pidfile # A function to find the pid of a program. Looks *only* at the pidfile

2
dist/master/setup.sh vendored
View File

@ -146,6 +146,7 @@ CONF_PATH=$PREFIX_PATH$INSTALL_PATH/conf
SERVICE_PATH=$PREFIX_PATH$INSTALL_PATH/conf/service SERVICE_PATH=$PREFIX_PATH$INSTALL_PATH/conf/service
LIBEXEC_PATH=$PREFIX_PATH$INSTALL_PATH/libexec LIBEXEC_PATH=$PREFIX_PATH$INSTALL_PATH/libexec
INIT_PATH=$PREFIX_PATH/etc/init.d/ INIT_PATH=$PREFIX_PATH/etc/init.d/
SYSTEMD_INIT_PATH=$PREFIX_PATH/usr/lib/systemd/system/
SH_PATH=$PREFIX_PATH$INSTALL_PATH/sh SH_PATH=$PREFIX_PATH$INSTALL_PATH/sh
VAR_PATH=$PREFIX_PATH$INSTALL_PATH/var VAR_PATH=$PREFIX_PATH$INSTALL_PATH/var
@ -187,6 +188,7 @@ copy_all_file()
install_file a+x,go-wrx conf/service $SERVICE_PATH install_file a+x,go-wrx conf/service $SERVICE_PATH
# install_file a+x,go-wrx conf/service/samples $SERVICE_PATH/samples # install_file a+x,go-wrx conf/service/samples $SERVICE_PATH/samples
install_file a+x,go-wrx init.d/ $INIT_PATH install_file a+x,go-wrx init.d/ $INIT_PATH
install_file a-x,go-wx system/ $SYSTEMD_INIT_PATH
} }
guess_os guess_os

31
packaging/acl-master.spec
View File

@ -2,7 +2,7 @@
Summary: acl master framework Summary: acl master framework
Name: acl-master Name: acl-master
Version: 3.5.3 Version: 3.5.4
Release: %{release_id} Release: %{release_id}
Group: System Environment/Tools Group: System Environment/Tools
License: IBM License: IBM
@ -32,23 +32,37 @@ make install_master DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot} rm -rf %{buildroot}
%post %post
/sbin/chkconfig --add master
if [ "$1" == "1" ]; then if [ "$1" == "1" ]; then
echo "starting acl_master ..." echo "starting acl_master ..."
service master start > /dev/null 2>&1 ||: %if 0%{?el7:1} || 0%{?el8:1}
systemctl enable master.service > /dev/null 2>&1 || :
systemctl start master.service > /dev/null 2>&1 || :
%else
/sbin/chkconfig --add master
service master start > /dev/null 2>&1 ||:
%endif
fi fi
%preun %preun
if [ "$1" == "0" ]; then if [ "$1" == "0" ]; then
service master stop >/dev/null 2>&1 ||: %if 0%{?el7:1} || 0%{?el8:1}
/sbin/chkconfig --del master systemctl stop master.service > /dev/null 2>&1 || :
systemctl disable master.service > /dev/null 2>&1 || :
%else
service master stop >/dev/null 2>&1 ||:
/sbin/chkconfig --del master
%endif
fi fi
%postun %postun
if [ "$1" -ge "1" ]; then if [ "$1" -ge "1" ]; then
# TODO: upgrade should be support # TODO: upgrade should be support
echo "prepare restarting acl_master ..." echo "prepare restarting acl_master ..."
service master masterrestart > /dev/null 2>&1 ||: %if 0%{?el7:1} || 0%{?el8:1}
systemctl restart master.service > /dev/null 2>&1 || :
%else
service master masterrestart > /dev/null 2>&1 ||:
%endif
fi fi
%files %files
@ -61,8 +75,13 @@ fi
/opt/soft/acl-master/sh /opt/soft/acl-master/sh
/opt/soft/acl-master/var /opt/soft/acl-master/var
/etc/init.d/master /etc/init.d/master
%if 0%{?el7:1} || 0%{?el8:1}
/usr/lib/systemd/system/master.service
%endif
%changelog %changelog
* Mon Jun 13 2022 shuxin.zheng@qq.com 3.5.4-0-20220613.18
- feature: acl_master support master.service
* Wed Jun 01 2022 shuxin.zheng@qq.com 3.5.3-0-20220601.20 * Wed Jun 01 2022 shuxin.zheng@qq.com 3.5.3-0-20220601.20
- feature: acl_master can manage service not written by acl libs - feature: acl_master can manage service not written by acl libs