Sfoglia il codice sorgente

If daemon is specified then use proxy_pass

Bob Mottram 7 anni fa
parent
commit
666c2b1cb5
1 ha cambiato i file con 13 aggiunte e 2 eliminazioni
  1. 13
    2
      src/freedombone-template

+ 13
- 2
src/freedombone-template Vedi File

222
 echo "${app_name_upper}_ONION_PORT=$(( ( RANDOM % 1000 )  + 9010 ))"
222
 echo "${app_name_upper}_ONION_PORT=$(( ( RANDOM % 1000 )  + 9010 ))"
223
 echo "${app_name_upper}_REPO=\"${app_repo}\""
223
 echo "${app_name_upper}_REPO=\"${app_repo}\""
224
 echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
224
 echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
225
+if [ $app_daemon ]; then
226
+    echo "${app_name_upper}_PORT=TODO"
227
+fi
225
 echo ''
228
 echo ''
226
 echo "${app_name}=(ONION_ONLY"
229
 echo "${app_name}=(ONION_ONLY"
227
 echo "             ${app_name_upper}_DOMAIN_NAME"
230
 echo "             ${app_name_upper}_DOMAIN_NAME"
670
     echo "        echo '  # Location' >> \$${app_name}_nginx_site"
673
     echo "        echo '  # Location' >> \$${app_name}_nginx_site"
671
     echo "        echo '  location / {' >> \$${app_name}_nginx_site"
674
     echo "        echo '  location / {' >> \$${app_name}_nginx_site"
672
     echo "        nginx_limits \$${app_name_upper}_DOMAIN_NAME '15m'"
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
     echo "        echo '  }' >> \$${app_name}_nginx_site"
681
     echo "        echo '  }' >> \$${app_name}_nginx_site"
675
     echo "        echo '}' >> \$${app_name}_nginx_site"
682
     echo "        echo '}' >> \$${app_name}_nginx_site"
676
     echo '    else'
683
     echo '    else'
708
 echo "    echo '  # Location' >> \$${app_name}_nginx_site"
715
 echo "    echo '  # Location' >> \$${app_name}_nginx_site"
709
 echo "    echo '  location / {' >> \$${app_name}_nginx_site"
716
 echo "    echo '  location / {' >> \$${app_name}_nginx_site"
710
 echo "    nginx_limits \$${app_name_upper}_DOMAIN_NAME '15m'"
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
 echo "    echo '  }' >> \$${app_name}_nginx_site"
723
 echo "    echo '  }' >> \$${app_name}_nginx_site"
713
 echo "    echo '}' >> \$${app_name}_nginx_site"
724
 echo "    echo '}' >> \$${app_name}_nginx_site"
714
 if [[ "$app_php" == 'yes' ]]; then
725
 if [[ "$app_php" == 'yes' ]]; then