From b5d884f9f616db4c925b20d37fd683e6b97daa7e Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Fri, 21 Oct 2022 19:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96deb=E5=92=8Crpm=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- distribution/pom.xml | 40 ++++++++++++++----- distribution/src/main/deb/control/control | 4 +- distribution/src/main/deb/control/postinst | 1 + distribution/src/main/deb/control/postrm | 2 + systemd/README.md | 18 ++++----- ...{wildfire-im.service => im-server.service} | 2 +- 6 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 distribution/src/main/deb/control/postinst create mode 100644 distribution/src/main/deb/control/postrm rename systemd/{wildfire-im.service => im-server.service} (93%) diff --git a/distribution/pom.xml b/distribution/pom.xml index 2212c737..2ef2f6e8 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -106,14 +106,22 @@ ${project.basedir}/src/main/deb/control false - ${project.build.directory}/wildfirechat-${project.version}.deb + ${project.build.directory}/im-server-${project.version}.deb ${project.build.directory}/distribution-${project.version}-bundle-tar.tar.gz archive perm - /usr/local/wildfirechat/im + /usr/local/im-server + + + + ${project.basedir}/../systemd/im-server.service + file + + perm + /usr/lib/systemd/system @@ -139,26 +147,23 @@ Applications/Chat - wildfirechat - Wildfirechat + im-server noarch linux - /usr/local/wildfirechat/im + /usr/local/im-server _unpackaged_files_terminate_build 0 - target/wildfirechat-${project.version}.rpm + target/im-server-${project.version}.rpm - no - no java-1.8.0-openjdk-headless - /usr/local/wildfirechat/im + /usr/local/im-server 755 @@ -166,15 +171,28 @@ + + + /usr/lib/systemd/system + 644 + root + root + false + + + ${project.basedir}/../systemd/im-server.service + + + diff --git a/distribution/src/main/deb/control/control b/distribution/src/main/deb/control/control index 395c8ec0..f04a63ab 100644 --- a/distribution/src/main/deb/control/control +++ b/distribution/src/main/deb/control/control @@ -1,10 +1,10 @@ -Package: wildfirechat +Package: im-server Version: [[version]] Section: misc Priority: optional Architecture: all Maintainer: Wildfirechat -Description: Wildfirechat IM Server +Description: IM Server Distribution: development Depends: openjdk-8-jre-headless Homepage: https://wildfirechat.cn diff --git a/distribution/src/main/deb/control/postinst b/distribution/src/main/deb/control/postinst new file mode 100644 index 00000000..9b76642f --- /dev/null +++ b/distribution/src/main/deb/control/postinst @@ -0,0 +1 @@ +systemctl daemon-reload diff --git a/distribution/src/main/deb/control/postrm b/distribution/src/main/deb/control/postrm new file mode 100644 index 00000000..de159e4b --- /dev/null +++ b/distribution/src/main/deb/control/postrm @@ -0,0 +1,2 @@ +systemctl daemon-reload +rm -rf diff --git a/systemd/README.md b/systemd/README.md index fada6eb1..699fa93e 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -5,22 +5,22 @@ 如果是社区版可以下载野火release或则会自己源码编译,得到软件压缩包```distribution-bundle-tar.tar.gz```。如果是专业版使用专业版邮件里的链接下载软件压缩包,下载后先解压一次,得到```distribution-bundle-tar.tar.gz```压缩包。 ## 部署软件包 -创建```/usr/local/wildfirechat/im```目录,把软件包解压到这个目录下。解压后这个目录下有```bin```、```config```、```lib```等目录。 +创建```/usr/local/im-server```目录,把软件包解压到这个目录下。解压后这个目录下有```bin```、```config```、```lib```等目录。 > 专业版软件包压缩了2次,先解压出```distribution-bundle-tar.tar.gz```,再拷贝到IM目录再次解压,所以注意确认目录下有bin、config等目录才对。 ## 放置Server File -把```wildfire-im.service```放到```/etc/systemd/system/```目录下。 +把```im-server.service```放到```/etc/systemd/system/```目录下。 ## 管理服务 -* 启动: ```sudo systemctl start wildfire-im.service``` -* 停止: ```sudo systemctl stop wildfire-im.service``` -* 重启: ```sudo systemctl restart wildfire-im.service``` -* 查看控制台日志: ```sudo journalctl -f -u wildfire-im.service``` +* 启动: ```sudo systemctl start im-server.service``` +* 停止: ```sudo systemctl stop im-server.service``` +* 重启: ```sudo systemctl restart im-server.service``` +* 查看控制台日志: ```journalctl -f -u im-server.service``` ## 日志 -日志文件在```/usr/local/wildfirechat/im/logs```目录下。如果需要提供日志给野火官方,请把这个目录下的日志和制台日志(```journalctl -f -u wildfire-im.service```)一起发给野火。 +日志文件在```/usr/local/im-server/logs```目录下。如果需要提供日志给野火官方,请把这个目录下的日志和制台日志(```journalctl -f -u im-server.service```)一起发给野火。 -也可以把日志放到```/var/log/wildfirechat/im```目录下,可以修改```/usr/local/wildfirechat/im/config/log4j2.xml```修改日志的路径。 +也可以把日志放到```/var/log/im-server```目录下,可以修改```/usr/local/im-server/config/log4j2.xml```修改日志的路径。 ## 配置 -需要对IM服务配置来达到最好的执行效果,配置文件在````/usr/local/wildfirechat/im/config````目录下。另外还可以设置服务的内存大小,修改```/usr/local/wildfirechat/im/bin/wildfirechat.sh```文件的倒数3、4行。打开Xmx和Xms配置,设置为合适的内存大小。 +需要对IM服务配置来达到最好的执行效果,配置文件在````/usr/local/im-server/config````目录下。另外还可以设置服务的内存大小,修改```/usr/local/im-server/bin/wildfirechat.sh```文件的倒数3、4行。打开Xmx和Xms配置,设置为合适的内存大小。 diff --git a/systemd/wildfire-im.service b/systemd/im-server.service similarity index 93% rename from systemd/wildfire-im.service rename to systemd/im-server.service index c57e3e15..a43bed7d 100644 --- a/systemd/wildfire-im.service +++ b/systemd/im-server.service @@ -5,7 +5,7 @@ Wants=network-online.target After=network-online.target [Service] -WorkingDirectory=/usr/local/wildfirechat/im +WorkingDirectory=/usr/local/im-server ProtectProc=invisible