Browse Source

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 years ago
parent
commit
f51f3ebc01
3 changed files with 60 additions and 1 deletions
  1. 20
    0
      src/freedombone-app-matrix
  2. 21
    0
      src/freedombone-app-xmpp
  3. 19
    1
      src/freedombone-utils-turn

+ 20
- 0
src/freedombone-app-matrix View File

@@ -597,6 +597,9 @@ function remove_matrix {
597 597
 
598 598
     remove_completion_param install_matrix
599 599
     sed -i '/matrix/d' $COMPLETION_FILE
600
+
601
+    rm /etc/avahi/services/matrix.service
602
+    systemctl restart avahi-daemon
600 603
 }
601 604
 
602 605
 function install_home_server {
@@ -802,5 +805,22 @@ function install_matrix {
802 805
 
803 806
     set_completion_param "matrix domain" "$MATRIX_DOMAIN_NAME"
804 807
 
808
+    # Add avahi services
809
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/matrix.service
810
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/matrix.service
811
+    echo '<service-group>' >> /etc/avahi/services/matrix.service
812
+    echo '  <name replace-wildcards="yes">%h MATRIX</name>' >> /etc/avahi/services/matrix.service
813
+    echo '  <service>' >> /etc/avahi/services/matrix.service
814
+    echo '    <type>_matrix._tcp</type>' >> /etc/avahi/services/matrix.service
815
+    echo "    <port>$MATRIX_HTTP_PORT</port>" >> /etc/avahi/services/matrix.service
816
+    echo '  </service>' >> /etc/avahi/services/matrix.service
817
+    echo '  <service>' >> /etc/avahi/services/matrix.service
818
+    echo '    <type>_matrix._udp</type>' >> /etc/avahi/services/matrix.service
819
+    echo "    <port>$MATRIX_HTTP_PORT</port>" >> /etc/avahi/services/matrix.service
820
+    echo '  </service>' >> /etc/avahi/services/matrix.service
821
+    echo '</service-group>' >> /etc/avahi/services/matrix.service
822
+
823
+    systemctl restart avahi-daemon
824
+
805 825
     APP_INSTALLED=1
806 826
 }

+ 21
- 0
src/freedombone-app-xmpp View File

@@ -616,6 +616,10 @@ function remove_xmpp {
616 616
     remove_completion_param install_xmpp
617 617
     sed -i '/xmpp/d' $COMPLETION_FILE
618 618
     sed -i '/prosody/d' $COMPLETION_FILE
619
+
620
+    rm /etc/avahi/services/xmpp.service
621
+    rm /etc/avahi/services/xmpp-server.service
622
+    systemctl restart avahi-daemon
619 623
 }
620 624
 
621 625
 function xmpp_email_headers {
@@ -1131,6 +1135,23 @@ function install_xmpp {
1131 1135
 
1132 1136
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a xmpp -p "$XMPP_PASSWORD"
1133 1137
 
1138
+    # Add avahi services
1139
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/xmpp.service
1140
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/xmpp.service
1141
+    echo '<service-group>' >> /etc/avahi/services/xmpp.service
1142
+    echo '  <name replace-wildcards="yes">%h XMPP</name>' >> /etc/avahi/services/xmpp.service
1143
+    echo '  <service>' >> /etc/avahi/services/xmpp.service
1144
+    echo '    <type>_xmpp._tcp</type>' >> /etc/avahi/services/xmpp.service
1145
+    echo "    <port>5222</port>" >> /etc/avahi/services/xmpp.service
1146
+    echo '  </service>' >> /etc/avahi/services/xmpp.service
1147
+    echo '  <service>' >> /etc/avahi/services/xmpp.service
1148
+    echo '    <type>_xmpp-server._tcp</type>' >> /etc/avahi/services/xmpp.service
1149
+    echo "    <port>5269</port>" >> /etc/avahi/services/xmpp.service
1150
+    echo '  </service>' >> /etc/avahi/services/xmpp.service
1151
+    echo '</service-group>' >> /etc/avahi/services/xmpp.service
1152
+
1153
+    systemctl restart avahi-daemon
1154
+
1134 1155
     APP_INSTALLED=1
1135 1156
 }
1136 1157
 

+ 19
- 1
src/freedombone-utils-turn View File

@@ -48,6 +48,7 @@ function generate_turn_key {
48 48
 
49 49
 function remove_turn {
50 50
     firewall_remove ${TURN_HTTP_PORT}
51
+    firewall_remove ${TURN_PORT}
51 52
     systemctl stop turn
52 53
     systemctl disable turn
53 54
     if [ -f /etc/systemd/system/turn.service ]; then
@@ -59,6 +60,7 @@ function remove_turn {
59 60
     rm -rf /var/lib/turn
60 61
     sed -i "/# TURN Server/,/# End of TURN Server/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
61 62
     remove_onion_service turn ${TURN_ONION_PORT}
63
+    rm /etc/avahi/services/turn.service
62 64
     systemctl restart nginx
63 65
 }
64 66
 
@@ -173,10 +175,26 @@ function install_turn {
173 175
     systemctl daemon-reload
174 176
     systemctl start turn
175 177
 
176
-    firewall_add turn ${TURN_HTTP_PORT}
178
+    firewall_add turn ${TURN_PORT}
179
+    firewall_add turn-http ${TURN_HTTP_PORT}
177 180
 
178 181
     TURN_ONION_HOSTNAME=$(add_onion_service turn ${TURN_PORT} ${TURN_ONION_PORT})
179 182
 
183
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/turn.service
184
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/turn.service
185
+    echo '<service-group>' >> /etc/avahi/services/turn.service
186
+    echo '  <name replace-wildcards="yes">%h TURN</name>' >> /etc/avahi/services/turn.service
187
+    echo '  <service>' >> /etc/avahi/services/turn.service
188
+    echo '    <type>_turn._tcp</type>' >> /etc/avahi/services/turn.service
189
+    echo "    <port>$TURN_PORT</port>" >> /etc/avahi/services/turn.service
190
+    echo '  </service>' >> /etc/avahi/services/turn.service
191
+    echo '  <service>' >> /etc/avahi/services/turn.service
192
+    echo '    <type>_turn._udp</type>' >> /etc/avahi/services/turn.service
193
+    echo "    <port>$TURN_PORT</port>" >> /etc/avahi/services/turn.service
194
+    echo '  </service>' >> /etc/avahi/services/turn.service
195
+    echo '</service-group>' >> /etc/avahi/services/turn.service
196
+
197
+    systemctl restart avahi-daemon
180 198
     systemctl restart nginx
181 199
 }
182 200