Quellcode durchsuchen

If daemon is specified then use proxy_pass

Bob Mottram vor 7 Jahren
Ursprung
Commit
666c2b1cb5
1 geänderte Dateien mit 13 neuen und 2 gelöschten Zeilen
  1. 13
    2
      src/freedombone-template

+ 13
- 2
src/freedombone-template Datei anzeigen

@@ -222,6 +222,9 @@ echo "${app_name_upper}_CODE="
222 222
 echo "${app_name_upper}_ONION_PORT=$(( ( RANDOM % 1000 )  + 9010 ))"
223 223
 echo "${app_name_upper}_REPO=\"${app_repo}\""
224 224
 echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
225
+if [ $app_daemon ]; then
226
+    echo "${app_name_upper}_PORT=TODO"
227
+fi
225 228
 echo ''
226 229
 echo "${app_name}=(ONION_ONLY"
227 230
 echo "             ${app_name_upper}_DOMAIN_NAME"
@@ -670,7 +673,11 @@ if [ $app_onion_only ]; then
670 673
     echo "        echo '  # Location' >> \$${app_name}_nginx_site"
671 674
     echo "        echo '  location / {' >> \$${app_name}_nginx_site"
672 675
     echo "        nginx_limits \$${app_name_upper}_DOMAIN_NAME '15m'"
673
-    echo "        echo '    try_files \$uri \$uri/ @${app_name};' >> \$${app_name}_nginx_site"
676
+    if [ ! $app_daemon ]; then
677
+        echo "        echo '    try_files \$uri \$uri/ /index.html;' >> \$${app_name}_nginx_site"
678
+    else
679
+        echo "        echo '    proxy_pass http://localhost:\$${app_name_upper}_PORT;' >> \$${app_name}_nginx_site"
680
+    fi
674 681
     echo "        echo '  }' >> \$${app_name}_nginx_site"
675 682
     echo "        echo '}' >> \$${app_name}_nginx_site"
676 683
     echo '    else'
@@ -708,7 +715,11 @@ fi
708 715
 echo "    echo '  # Location' >> \$${app_name}_nginx_site"
709 716
 echo "    echo '  location / {' >> \$${app_name}_nginx_site"
710 717
 echo "    nginx_limits \$${app_name_upper}_DOMAIN_NAME '15m'"
711
-echo "    echo '    try_files \$uri \$uri/ @${app_name};' >> \$${app_name}_nginx_site"
718
+if [ ! $app_daemon ]; then
719
+    echo "    echo '    try_files \$uri \$uri/ index.html;' >> \$${app_name}_nginx_site"
720
+else
721
+    echo "    echo '    proxy_pass http://localhost:\$${app_name_upper}_PORT;' >> \$${app_name}_nginx_site"
722
+fi
712 723
 echo "    echo '  }' >> \$${app_name}_nginx_site"
713 724
 echo "    echo '}' >> \$${app_name}_nginx_site"
714 725
 if [[ "$app_php" == 'yes' ]]; then