优化deb和rpm包

distribution/pom.xml

@@ -106,14 +106,22 @@
                         <configuration>
                             <controlDir>${project.basedir}/src/main/deb/control</controlDir>
                             <skipPOMs>false</skipPOMs>
-                            <deb>${project.build.directory}/wildfirechat-${project.version}.deb</deb>
+                            <deb>${project.build.directory}/im-server-${project.version}.deb</deb>
                             <dataSet>
                                 <data>
                                     <src>${project.build.directory}/distribution-${project.version}-bundle-tar.tar.gz</src>
                                     <type>archive</type>
                                     <mapper>
                                         <type>perm</type>
-                                        <prefix>/usr/local/wildfirechat/im</prefix>
+                                        <prefix>/usr/local/im-server</prefix>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <src>${project.basedir}/../systemd/im-server.service</src>
+                                    <type>file</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/usr/lib/systemd/system</prefix>
                                     </mapper>
                                 </data>
                             </dataSet>
@@ -139,26 +147,23 @@
 
                 <configuration>
                     <group>Applications/Chat</group>
-                    <name>wildfirechat</name>
+                    <name>im-server</name>
-                    <packager>Wildfirechat</packager>
                     <needarch>noarch</needarch>
                     <targetOS>linux</targetOS>
-                    <prefix>/usr/local/wildfirechat/im</prefix>
+                    <prefix>/usr/local/im-server</prefix>
                     <defineStatements>
                         <defineStatement>_unpackaged_files_terminate_build 0</defineStatement>
                     </defineStatements>
                     <copyTo>
-                        target/wildfirechat-${project.version}.rpm
+                        target/im-server-${project.version}.rpm
                     </copyTo>
-                    <autoRequires>no</autoRequires>
-                    <autoProvides>no</autoProvides>
                     <requires>
                         <require>java-1.8.0-openjdk-headless</require>
                     </requires>
 
                     <mappings>
                         <mapping>
-                            <directory>/usr/local/wildfirechat/im</directory>
+                            <directory>/usr/local/im-server</directory>
                             <filemode>755</filemode>
                             <sources>
                                 <source>
@@ -166,15 +171,28 @@
                                 </source>
                             </sources>
                         </mapping>
+
+                        <mapping>
+                            <directory>/usr/lib/systemd/system</directory>
+                            <filemode>644</filemode>
+                            <username>root</username>
+                            <groupname>root</groupname>
+                            <directoryIncluded>false</directoryIncluded>
+                            <sources>
+                                <source>
+                                    <location>${project.basedir}/../systemd/im-server.service</location>
+                                </source>
+                            </sources>
+                        </mapping>
                     </mappings>
                     <postinstallScriptlet>
                         <script>
-                            echo "Unzip packages..." ; cd /usr/local/wildfirechat/im ; tar -xzvf distribution*.tar.gz ; echo "Wildfire im installed in /usr/local/wildfirechat/im"
+                            echo "Unzip packages..." ; cd /usr/local/im-server ; tar -xzvf distribution*.tar.gz ; echo "Im server installed in /usr/local/im-server" ; systemctl daemon-reload
                         </script>
                     </postinstallScriptlet>
                     <postremoveScriptlet>
                         <script>
-                            echo "Remove files..." ; cd /usr/local/wildfirechat/im ; rm -rf *
+                            echo "Remove files..." ; cd /usr/local/im-server ; rm -rf * ; rm -rf /usr/lib/systemd/system/im-server.service ; systemctl daemon-reload
                         </script>
                     </postremoveScriptlet>
                 </configuration>

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 <[email protected]>
-Description:  Wildfirechat IM Server
+Description:  IM Server
 Distribution: development
 Depends: openjdk-8-jre-headless
 Homepage: https://wildfirechat.cn

distribution/src/main/deb/control/postinst

@@ -0,0 +1 @@
+systemctl daemon-reload

distribution/src/main/deb/control/postrm

@@ -0,0 +1,2 @@
+systemctl daemon-reload
+rm -rf

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 start im-server.service```
-* 停止： ```sudo systemctl stop wildfire-im.service```
+* 停止： ```sudo systemctl stop im-server.service```
-* 重启： ```sudo systemctl restart wildfire-im.service```
+* 重启： ```sudo systemctl restart im-server.service```
-* 查看控制台日志: ```sudo journalctl -f -u wildfire-im.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配置，设置为合适的内存大小。

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