瀏覽代碼

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
 function remove_user_xmpp {
171
 function remove_user_xmpp {
172
     remove_username="$1"
172
     remove_username="$1"
173
     ${PROJECT_NAME}-pass -u $remove_username --rmapp xmpp
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
 function add_user_xmpp {
182
 function add_user_xmpp {
178
     new_username="$1"
183
     new_username="$1"
179
     new_user_password="$2"
184
     new_user_password="$2"
180
 
185
 
186
+    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
181
     ${PROJECT_NAME}-pass -u $new_username -a xmpp -p "$new_user_password"
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
     if [ ! "$?" = "0" ]; then
194
     if [ ! "$?" = "0" ]; then
185
         echo '1'
195
         echo '1'
186
         return
196
         return
194
     if [ ! -d /home/$new_username/.config/profanity ]; then
204
     if [ ! -d /home/$new_username/.config/profanity ]; then
195
         mkdir -p /home/$new_username/.config/profanity
205
         mkdir -p /home/$new_username/.config/profanity
196
     fi
206
     fi
197
-    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
198
     GPG_PUBLIC_KEY_ID=$(su -c "gpg --list-keys $new_username@$HOSTNAME | grep 'pub '" - $new_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
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
     echo "[${new_username}@${HOSTNAME}]" > $XMPP_CLIENT_ACCOUNTS
208
     echo "[${new_username}@${HOSTNAME}]" > $XMPP_CLIENT_ACCOUNTS
200
     echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS
209
     echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS
213
     echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS
222
     echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS
214
 
223
 
215
     echo '[connection]' > /home/$new_username/.config/profanity/profrc
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
     echo '' >> /home/$new_username/.config/profanity/profrc
230
     echo '' >> /home/$new_username/.config/profanity/profrc
218
     echo '[plugins]' >> /home/$new_username/.config/profanity/profrc
231
     echo '[plugins]' >> /home/$new_username/.config/profanity/profrc
219
     echo 'load=prof_omemo_plugin.py;' >> /home/$new_username/.config/profanity/profrc
232
     echo 'load=prof_omemo_plugin.py;' >> /home/$new_username/.config/profanity/profrc
958
     systemctl restart prosody
971
     systemctl restart prosody
959
 
972
 
960
     cd
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
     if [ ! "$?" = "0" ]; then
979
     if [ ! "$?" = "0" ]; then
963
         echo ''
980
         echo ''
964
         echo ''
981
         echo ''
1098
         mkdir -p /home/$MY_USERNAME/.config/profanity
1115
         mkdir -p /home/$MY_USERNAME/.config/profanity
1099
     fi
1116
     fi
1100
     echo '[connection]' > /home/$MY_USERNAME/.config/profanity/profrc
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
     echo '' >> /home/$MY_USERNAME/.config/profanity/profrc
1123
     echo '' >> /home/$MY_USERNAME/.config/profanity/profrc
1103
     echo '[plugins]' >> /home/$MY_USERNAME/.config/profanity/profrc
1124
     echo '[plugins]' >> /home/$MY_USERNAME/.config/profanity/profrc
1104
     echo 'load=prof_omemo_plugin.py;' >> /home/$MY_USERNAME/.config/profanity/profrc
1125
     echo 'load=prof_omemo_plugin.py;' >> /home/$MY_USERNAME/.config/profanity/profrc