|
@@ -141,6 +141,7 @@ function remove_keyserver {
|
141
|
141
|
remove_config_param KEYSERVER_CODE
|
142
|
142
|
function_check remove_onion_service
|
143
|
143
|
remove_onion_service keyserver ${KEYSERVER_ONION_PORT}
|
|
144
|
+ remove_onion_service sks 11370 11371 11372
|
144
|
145
|
remove_completion_param "install_keyserver"
|
145
|
146
|
|
146
|
147
|
firewall_remove 11370 tcp
|
|
@@ -287,6 +288,22 @@ function install_keyserver {
|
287
|
288
|
echo 'max_matches: 500' >> $sksconf_file
|
288
|
289
|
chown debian-sks: $sksconf_file
|
289
|
290
|
|
|
291
|
+ if ! grep -q "hidden_service_sks" /etc/tor/torrc; then
|
|
292
|
+ echo 'HiddenServiceDir /var/lib/tor/hidden_service_sks/' >> /etc/tor/torrc
|
|
293
|
+ echo "HiddenServicePort 11370 127.0.0.1:11370" >> /etc/tor/torrc
|
|
294
|
+ echo "HiddenServicePort 11371 127.0.0.1:11371" >> /etc/tor/torrc
|
|
295
|
+ echo "HiddenServicePort 11372 127.0.0.1:11372" >> /etc/tor/torrc
|
|
296
|
+ echo $'Added onion site for sks'
|
|
297
|
+ fi
|
|
298
|
+
|
|
299
|
+ onion_update
|
|
300
|
+ wait_for_onion_service 'sks'
|
|
301
|
+
|
|
302
|
+ if [ ! -f /var/lib/tor/hidden_service_xmpp/hostname ]; then
|
|
303
|
+ echo $'xmpp onion site hostname not found'
|
|
304
|
+ exit 65349
|
|
305
|
+ fi
|
|
306
|
+
|
290
|
307
|
KEYSERVER_ONION_HOSTNAME=$(add_onion_service keyserver 80 ${KEYSERVER_ONION_PORT})
|
291
|
308
|
|
292
|
309
|
keyserver_nginx_site=/etc/nginx/sites-available/$KEYSERVER_DOMAIN_NAME
|