|
@@ -296,8 +296,13 @@ function turtl_setup {
|
296
|
296
|
BINDADDR=${BINDADDR:-0.0.0.0}
|
297
|
297
|
BINDPORT=${BINDPORT:-8181}
|
298
|
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
|
306
|
ADMIN_EMAIL=${ADMIN_EMAIL:-$MY_USERNAME@$DEFAULT_DOMAIN_NAME}
|
302
|
307
|
EMAIL_FROM=${EMAIL_FROM:-noreply@$DEFAULT_DOMAIN_NAME}
|
303
|
308
|
SMTP_USER=${SMTP_USER:-}
|
|
@@ -305,7 +310,11 @@ function turtl_setup {
|
305
|
310
|
DISPLAY_ERRORS=${DISPLAY_ERRORS:-t}
|
306
|
311
|
DEFAULT_STORAGE_LIMIT=${DEFAULT_STORAGE_LIMIT:-100}
|
307
|
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
|
318
|
LOCAL_UPLOAD_PATH=${LOCAL_UPLOAD_PATH:-"$TURTL_BASE_DIR/data"}
|
310
|
319
|
AWS_S3_TOKEN=${AWS_S3_TOKEN:-(:token ''
|
311
|
320
|
:secret ''
|
|
@@ -529,12 +538,12 @@ __ENDCONFIG__
|
529
|
538
|
echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" >> $TURTL_BASE_DIR/api/launch.lisp
|
530
|
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
|
543
|
turtl_setup
|
533
|
544
|
}
|
534
|
545
|
|
535
|
546
|
function install_turtl_nginx {
|
536
|
|
- TURTL_API_ONION_HOSTNAME=$(add_onion_service turtlapi 80 ${TURTL_API_ONION_PORT})
|
537
|
|
-
|
538
|
547
|
turtl_nginx_site=/etc/nginx/sites-available/$TURTL_API_DOMAIN_NAME
|
539
|
548
|
if [[ $ONION_ONLY == "no" ]]; then
|
540
|
549
|
function_check nginx_http_redirect
|