修改代码

Makefile.in

@@ -175,8 +175,8 @@ install: all copy-files
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
 	[ -f $(ETCDIR)/ejabberd.yml ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.qunar $(ETCDIR)/ejabberd.yml-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.qunar $(ETCDIR)/ejabberd.yml
 	$(SED) -e "s*{{rootdir}}*@prefix@*" \
 		-e "s*{{installuser}}*@INSTALLUSER@*" \
 		-e "s*{{bindir}}*@bindir@*" \
@@ -188,8 +188,9 @@ install: all copy-files
 		-e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
 		> ejabberdctl.example
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.qunar $(ETCDIR)/ejabberdctl.cfg-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.qunar $(ETCDIR)/ejabberdctl.cfg
+	$(INSTALL) -b -m 640 $(G_USER) server.pem $(ETCDIR)/server.pem
 	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
 	#
 	# Administration script

ejabberd.yml.qunar

@@ -114,7 +114,8 @@ listen:
   - 
     port: 5222
     module: ejabberd_c2s
-    #certfile: "/path/server.pem"
+    certfile: "/startalk/ejabberd/etc/ejabberd/server.pem"
+    starttls: true
     #starttls: true
     ##
     ## If TLS is compiled in and you installed a SSL
@@ -139,8 +140,8 @@ listen:
     access: c2s
   -
     port: 5202
-    #certfile: "/path/server.pem"
-    #starttls: true
+    certfile: "/startalk/ejabberd/etc/ejabberd/server.pem"
+    starttls: true
     zlib: false
     module: ejabberd_protobuf_c2s
     max_stanza_size: 365536

server.pem

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIC3jCCAkegAwIBAgIJAIY3VjlXHib3MA0GCSqGSIb3DQEBCwUAMIGHMQswCQYD
+VQQGEwJjbjELMAkGA1UECAwCYmoxCzAJBgNVBAcMAmJqMRYwFAYDVQQKDA1vcGVu
+cmVzdHkub3JnMQwwCgYDVQQLDANvcmcxFjAUBgNVBAMMDW9wZW5yZXN0eS5vcmcx
+IDAeBgkqhkiG9w0BCQEWEXhpbi54aWVAcXVuYXIuY29tMB4XDTE4MTEyNzA4MTc0
+MloXDTI4MTEyNDA4MTc0MlowgYcxCzAJBgNVBAYTAmNuMQswCQYDVQQIDAJiajEL
+MAkGA1UEBwwCYmoxFjAUBgNVBAoMDW9wZW5yZXN0eS5vcmcxDDAKBgNVBAsMA29y
+ZzEWMBQGA1UEAwwNb3BlbnJlc3R5Lm9yZzEgMB4GCSqGSIb3DQEJARYReGluLnhp
+ZUBxdW5hci5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALgNj1N58ViR
+E1O4YwbeXw8QV+NiwNqGI2JPb1gn4L/Sk9en5tFoZpNcjNgcKwfs34sritgk+Pru
+Ay/qqCIvJ+yxy9otzL/26zUmaw8icYhv0Aj/rC4lRzIo0JGDQGOn+FGoTMhv0Xbs
+9kWwYGdbbg5etAJw+hS8FZJwEnt+atZhAgMBAAGjUDBOMB0GA1UdDgQWBBSEMyO5
+th3Ee299Xt+m5nZ7n1iHUDAfBgNVHSMEGDAWgBSEMyO5th3Ee299Xt+m5nZ7n1iH
+UDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBALZvYUbPciUjuJmM8tkZ
+EYwhDVL+Wrf7jqvce922EC2CTez1+xWJOnvTKx8EaOYrSSyNfRYSVYAM0JV/DW8R
+BeM3AxfLKK0p1Z//cqjunDaadZR96+hc5lInF0Ve8rk9v+os5+WceoZU0XoBOrJy
+5Hl8WanJCpzvf7kGrzpAfndu
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC4DY9TefFYkRNTuGMG3l8PEFfjYsDahiNiT29YJ+C/0pPXp+bR
+aGaTXIzYHCsH7N+LK4rYJPj67gMv6qgiLyfsscvaLcy/9us1JmsPInGIb9AI/6wu
+JUcyKNCRg0Bjp/hRqEzIb9F27PZFsGBnW24OXrQCcPoUvBWScBJ7fmrWYQIDAQAB
+AoGBAJsYgiC7747Moda42GnfVYdiJE2u2AjNZF/hxFgrMo8yqfbeu/jW2yluohky
+k2hYSYADLzs43L7HdtQYD5rO1fqFLMHDPGMMUEY0lvfZ8sy7sxr7bUqmnctPtUE6
+eF4Huxq0QH1uGfvh3HwpYkKeXxIvcxZPIjuSss2EvuqWI8uJAkEA8tiH2yNEfjfu
+LNRGN2JSJHsW7cwuze/r8z9zLA6y8d32c1HJqqGtAyHD4+qu+oeP0rRJIp9atVVv
+MyXiOs6S6wJBAMIFxDn0QsauiZCD71LdHiQZA8QEEgzrqohyavw13oJ1T98bYViU
+ZcvwT4XNutK4ySXtut8xUbIO6Yvyutt3sOMCQFKWcR2FkPWb79QvHPIY7faaJeIZ
+XpGK1qOTIIgLN7Ap3Ha7ieoNsdku0n/ggEGTeMYfqf+sUhz5QSgT6iw1tKECQHvD
+i+lgC5yLR4sc7fPQwuJJ5qIJ6q29QrnpKp+ZiUd0p69s2srTVqAhuchjdHHol78P
+B25KGo/XfVjdTB6lGfsCQQChOe3XHPOVlPlPYuPcr6eov9Vk8ZUSj2HOVYQxIp/b
+xse2T8ldKtloB6TN2JFMdKJk5gMVMyjH9VC1Us8/DVYr
+-----END RSA PRIVATE KEY-----

src/mod_handle_muc_iq.erl

@@ -10,7 +10,6 @@ handle_iq(Server,Room,Host,<<"">>,From,To,Packet) ->
         sub_el = #xmlel{name = SubElName} = SubEl} = IQ
     when    (XMLNS == (?NS_MUC_ADMIN)) or
             (XMLNS == (?NS_MUC_REGISTER)) or
-            (XMLNS == (?NS_MUC_INVITE)) or
             (XMLNS == (?NS_MUC_INVITE_V2)) or
             (XMLNS == (?NS_MUC_OWNER)) or
             (XMLNS == (?NS_CREATE_MUC)) or
@@ -40,11 +39,6 @@ handle_iq(Server,Room,Host,<<"">>,From,To,Packet) ->
                 hanlde_IQ_Res(Res,IQ,SubElName,SubEl,XMLNS,To,From);
             set -> send_error_packet(From,To,Packet)
             end;
-        ?NS_MUC_INVITE ->
-            case Type of
-            set -> mod_muc:recreate_muc_room(Server,Host,Room,From,<<"">>,Packet,true);
-            _ -> send_error_packet(From,To,Packet)
-            end;
         ?NS_MUC_INVITE_V2 ->
             case Type of
             set -> mod_muc:recreate_muc_room(Server,Host,Room,From,<<"">>,Packet,true);