瀏覽代碼

onion only xmpp install

Bob Mottram 8 年之前
父節點
當前提交
2487997a4c
共有 1 個文件被更改,包括 27 次插入6 次删除
  1. 27
    6
      src/freedombone-app-xmpp

+ 27
- 6
src/freedombone-app-xmpp 查看文件

@@ -171,16 +171,26 @@ function configure_interactive_xmpp {
171 171
 function remove_user_xmpp {
172 172
     remove_username="$1"
173 173
     ${PROJECT_NAME}-pass -u $remove_username --rmapp xmpp
174
-    ${PROJECT_NAME}-rmxmpp -e "${remove_username}@$HOSTNAME"
174
+    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
175
+    if [[ $ONION_ONLY != "no" ]]; then
176
+        ${PROJECT_NAME}-rmxmpp -e "${remove_username}@${XMPP_ONION_HOSTNAME}"
177
+    else
178
+        ${PROJECT_NAME}-rmxmpp -e "${remove_username}@${HOSTNAME}"
179
+    fi
175 180
 }
176 181
 
177 182
 function add_user_xmpp {
178 183
     new_username="$1"
179 184
     new_user_password="$2"
180 185
 
186
+    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
181 187
     ${PROJECT_NAME}-pass -u $new_username -a xmpp -p "$new_user_password"
182 188
 
183
-    ${PROJECT_NAME}-addxmpp -e "$new_username@$HOSTNAME" -p "$new_user_password"
189
+    if [[ $ONION_ONLY != "no" ]]; then
190
+        ${PROJECT_NAME}-addxmpp -e "$new_username@$XMPP_ONION_HOSTNAME" -p "$new_user_password"
191
+    else
192
+        ${PROJECT_NAME}-addxmpp -e "$new_username@$HOSTNAME" -p "$new_user_password"
193
+    fi
184 194
     if [ ! "$?" = "0" ]; then
185 195
         echo '1'
186 196
         return
@@ -194,7 +204,6 @@ function add_user_xmpp {
194 204
     if [ ! -d /home/$new_username/.config/profanity ]; then
195 205
         mkdir -p /home/$new_username/.config/profanity
196 206
     fi
197
-    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
198 207
     GPG_PUBLIC_KEY_ID=$(su -c "gpg --list-keys $new_username@$HOSTNAME | grep 'pub '" - $new_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
199 208
     echo "[${new_username}@${HOSTNAME}]" > $XMPP_CLIENT_ACCOUNTS
200 209
     echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS
@@ -213,7 +222,11 @@ function add_user_xmpp {
213 222
     echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS
214 223
 
215 224
     echo '[connection]' > /home/$new_username/.config/profanity/profrc
216
-    echo "account=${new_username}@${HOSTNAME}" >> /home/$new_username/.config/profanity/profrc
225
+    if [[ $ONION_ONLY != "no" ]]; then
226
+        echo "account=${new_username}@${XMPP_ONION_HOSTNAME}" >> /home/$new_username/.config/profanity/profrc
227
+    else
228
+        echo "account=${new_username}@${HOSTNAME}" >> /home/$new_username/.config/profanity/profrc
229
+    fi
217 230
     echo '' >> /home/$new_username/.config/profanity/profrc
218 231
     echo '[plugins]' >> /home/$new_username/.config/profanity/profrc
219 232
     echo 'load=prof_omemo_plugin.py;' >> /home/$new_username/.config/profanity/profrc
@@ -958,7 +971,11 @@ function install_xmpp_main {
958 971
     systemctl restart prosody
959 972
 
960 973
     cd
961
-    prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME "$XMPP_PASSWORD"
974
+    if [[ $ONION_ONLY != 'no' ]]; then
975
+        prosodyctl register $MY_USERNAME $XMPP_ONION_HOSTNAME "$XMPP_PASSWORD"
976
+    else
977
+        prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME "$XMPP_PASSWORD"
978
+    fi
962 979
     if [ ! "$?" = "0" ]; then
963 980
         echo ''
964 981
         echo ''
@@ -1098,7 +1115,11 @@ function install_xmpp_client {
1098 1115
         mkdir -p /home/$MY_USERNAME/.config/profanity
1099 1116
     fi
1100 1117
     echo '[connection]' > /home/$MY_USERNAME/.config/profanity/profrc
1101
-    echo "account=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> /home/$MY_USERNAME/.config/profanity/profrc
1118
+    if [[ $ONION_ONLY == 'no' ]]; then
1119
+        echo "account=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> /home/$MY_USERNAME/.config/profanity/profrc
1120
+    else
1121
+        echo "account=${MY_USERNAME}@${XMPP_ONION_HOSTNAME}" >> /home/$MY_USERNAME/.config/profanity/profrc
1122
+    fi
1102 1123
     echo '' >> /home/$MY_USERNAME/.config/profanity/profrc
1103 1124
     echo '[plugins]' >> /home/$MY_USERNAME/.config/profanity/profrc
1104 1125
     echo 'load=prof_omemo_plugin.py;' >> /home/$MY_USERNAME/.config/profanity/profrc