moved s2s config in separate file

EXTRAS/example-configurations/conf.d/30-tls.yml

@@ -12,7 +12,6 @@ c2s_ciphers: 'TLS_CIPHERS'
 s2s_ciphers: 'TLS_CIPHERS'
 c2s_protocol_options: 'TLS_OPTIONS'
 s2s_protocol_options: 'TLS_OPTIONS'
-s2s_use_starttls: required
 
 certfiles:
   - /etc/ssl/ejabberd/fullchain.pem

EXTRAS/example-configurations/conf.d/42-c2s.yml

@@ -0,0 +1,20 @@
+listen:
+  -
+    # c2s via starttls
+    port: 5222
+    ip: "::" #listen to v4 and v6
+    module: ejabberd_c2s
+    starttls_required: true
+    max_stanza_size: 262144
+    shaper: c2s_shaper
+    access: c2s
+
+  -
+    # c2s via tls
+    port: 5223
+    ip: "::" #listen to v4 and v6
+    module: ejabberd_c2s
+    tls: true
+    max_stanza_size: 262144
+    shaper: c2s_shaper
+    access: c2s

EXTRAS/example-configurations/ejabberd.yml

@@ -14,14 +14,11 @@ include_config_file:
   - /home/ejabberd/conf/conf.d/30-tls.yml
   - /home/ejabberd/conf/conf.d/31-auth.yml
   - /home/ejabberd/conf/conf.d/41-s2s.yml
+  - /home/ejabberd/conf/conf.d/42-c2s.yml
   - /home/ejabberd/conf/conf.d/50-stun-turn.yml
 
 listen:
   -
-    port: 5269
-    module: ejabberd_s2s_in
-    max_stanza_size: 524288
-  -
     port: 5443
     ip: "::"
     module: ejabberd_http