Bob Mottram пре 8 година
родитељ
комит
7fefb18bcb
1 измењених фајлова са 14 додато и 5 уклоњено
  1. 14
    5
      src/freedombone-app-turtl

+ 14
- 5
src/freedombone-app-turtl Прегледај датотеку

296
     BINDADDR=${BINDADDR:-0.0.0.0}
296
     BINDADDR=${BINDADDR:-0.0.0.0}
297
     BINDPORT=${BINDPORT:-8181}
297
     BINDPORT=${BINDPORT:-8181}
298
     PROD_ERR_HANDLING=${PROD_ERR_HANDLING:-t}
298
     PROD_ERR_HANDLING=${PROD_ERR_HANDLING:-t}
299
-    FQDN=${FQDN:-$TURTL_API_DOMAIN_NAME}
300
-    SITE_URL=${SITE_URL:-https://$TURTL_API_DOMAIN_NAME}
299
+    if [[ $ONION_ONLY == 'no' ]]; then
300
+        FQDN=${FQDN:-$TURTL_API_DOMAIN_NAME}
301
+        SITE_URL=${SITE_URL:-https://$TURTL_API_DOMAIN_NAME}
302
+    else
303
+        FQDN=${FQDN:-$TURTL_API_ONION_HOSTNAME}
304
+        SITE_URL=${SITE_URL:-http://$TURTL_API_ONION_HOSTNAME}
305
+    fi
301
     ADMIN_EMAIL=${ADMIN_EMAIL:-$MY_USERNAME@$DEFAULT_DOMAIN_NAME}
306
     ADMIN_EMAIL=${ADMIN_EMAIL:-$MY_USERNAME@$DEFAULT_DOMAIN_NAME}
302
     EMAIL_FROM=${EMAIL_FROM:-noreply@$DEFAULT_DOMAIN_NAME}
307
     EMAIL_FROM=${EMAIL_FROM:-noreply@$DEFAULT_DOMAIN_NAME}
303
     SMTP_USER=${SMTP_USER:-}
308
     SMTP_USER=${SMTP_USER:-}
305
     DISPLAY_ERRORS=${DISPLAY_ERRORS:-t}
310
     DISPLAY_ERRORS=${DISPLAY_ERRORS:-t}
306
     DEFAULT_STORAGE_LIMIT=${DEFAULT_STORAGE_LIMIT:-100}
311
     DEFAULT_STORAGE_LIMIT=${DEFAULT_STORAGE_LIMIT:-100}
307
     STORAGE_INVITE_CREDIT=${STORAGE_INVITE_CREDIT:-25}
312
     STORAGE_INVITE_CREDIT=${STORAGE_INVITE_CREDIT:-25}
308
-    LOCAL_UPLOAD_URL=${LOCAL_UPLOAD_URL:-https://$TURTL_API_DOMAIN_NAME}
313
+    if [[ $ONION_ONLY == 'no' ]]; then
314
+        LOCAL_UPLOAD_URL=${LOCAL_UPLOAD_URL:-https://$TURTL_API_DOMAIN_NAME}
315
+    else
316
+        LOCAL_UPLOAD_URL=${LOCAL_UPLOAD_URL:-http://$TURTL_API_ONION_HOSTNAME}
317
+    fi
309
     LOCAL_UPLOAD_PATH=${LOCAL_UPLOAD_PATH:-"$TURTL_BASE_DIR/data"}
318
     LOCAL_UPLOAD_PATH=${LOCAL_UPLOAD_PATH:-"$TURTL_BASE_DIR/data"}
310
     AWS_S3_TOKEN=${AWS_S3_TOKEN:-(:token ''
319
     AWS_S3_TOKEN=${AWS_S3_TOKEN:-(:token ''
311
                                   :secret ''
320
                                   :secret ''
529
     echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" >> $TURTL_BASE_DIR/api/launch.lisp
538
     echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" >> $TURTL_BASE_DIR/api/launch.lisp
530
     echo '(load "start")' >> $TURTL_BASE_DIR/api/launch.lisp
539
     echo '(load "start")' >> $TURTL_BASE_DIR/api/launch.lisp
531
 
540
 
541
+    TURTL_API_ONION_HOSTNAME=$(add_onion_service turtlapi 80 ${TURTL_API_ONION_PORT})
542
+
532
     turtl_setup
543
     turtl_setup
533
 }
544
 }
534
 
545
 
535
 function install_turtl_nginx {
546
 function install_turtl_nginx {
536
-    TURTL_API_ONION_HOSTNAME=$(add_onion_service turtlapi 80 ${TURTL_API_ONION_PORT})
537
-
538
     turtl_nginx_site=/etc/nginx/sites-available/$TURTL_API_DOMAIN_NAME
547
     turtl_nginx_site=/etc/nginx/sites-available/$TURTL_API_DOMAIN_NAME
539
     if [[ $ONION_ONLY == "no" ]]; then
548
     if [[ $ONION_ONLY == "no" ]]; then
540
         function_check nginx_http_redirect
549
         function_check nginx_http_redirect