diff --git "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/install_rsyslog.sh" "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/install_rsyslog.sh" index 85b6f119ed0cec845e036f02468f2a2847c6e27a..084b5df9ac897dcb3fe73f912126e94877b6d7b8 100644 --- "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/install_rsyslog.sh" +++ "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/install_rsyslog.sh" @@ -5,4 +5,12 @@ run_with_rsyslog=${0%/*} install -Dm0640 -t /lib/sysmaster/system ${run_with_rsyslog}/syslog.service +# backup config files +if [ -e "/etc/rsyslog.conf" ];then + mv /etc/rsyslog.conf /etc/rsyslog.conf_ori +fi + install -Dm0644 -t /etc ${run_with_rsyslog}/rsyslog.conf + +# create symlink under /etc/sysmaster/... for automatic startup +ln -s /lib/sysmaster/system/syslog.service /etc/sysmaster/system/multi-user.target.wants/syslog.service diff --git "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/readme.md" "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/readme.md" index 3d926ca9293667cc82a89d527956c2d586343758..dadb2305c71f9f5903ce8bf0346f6f22f8d9ae6d 100644 --- "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/readme.md" +++ "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/readme.md" @@ -16,9 +16,11 @@ # sh ./install_rsyslog.sh ``` +3.执行如下命令,删除步骤2中相关安装动作 + > **注意:** > -> `install_rsyslog.sh`安装脚本会覆盖系统中已有的`rsyslog`配置文件,安装前请手动备份`/etc/rsyslog.conf`文件。 +> `install_rsyslog.sh`安装脚本会将环境原有的/etc/rsyslog.conf备份为/etc/rsyslog.conf_ori,并且通过sctl enable syslog创建软连接,使能开机自启动。 > ## 部署使用 diff --git "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/syslog.service" "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/syslog.service" index 8705881edfb39b8d06fcbb8baf21ac56d430f2ff..35791ae2842ab2ab0489eb05332e21d99d283a34 100644 --- "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/syslog.service" +++ "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/syslog.service" @@ -8,3 +8,6 @@ ExecStart=/usr/sbin/rsyslogd -n -i/var/run/rsyslogd.pid ExecStartPost=/bin/bash /usr/bin/timezone_update.sh RestartSec=1000000 Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/uninstall_rsyslog.sh" "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/uninstall_rsyslog.sh" index 989c1147a712f964da436f93e4bd1f3402797448..27882beea37dedfcd595db3bb38b535c2d34cdaa 100644 --- "a/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/uninstall_rsyslog.sh" +++ "b/docs/use/sysmaster\344\270\213\344\275\277\350\203\275rsyslog/uninstall_rsyslog.sh" @@ -1,6 +1,10 @@ #!/bin/bash install_target=/lib/sysmaster/system +enable_target=/etc/sysmaster/system/multi-user.target.wants/ +test -f ${enable_target}/syslog.service && sctl disable syslog.service test -f ${install_target}/syslog.service && rm -f ${install_target}/syslog.service + +test -f /etc/rsyslog.conf_ori && mv -f /etc/rsyslog.conf_ori /etc/rsyslog.conf