浏览代码

Internal port

Bob Mottram 7 年前
父节点
当前提交
08a14be3f6
共有 1 个文件被更改,包括 19 次插入6 次删除
  1. 19
    6
      src/freedombone-template

+ 19
- 6
src/freedombone-template 查看文件

40
 app_php=
40
 app_php=
41
 app_node=
41
 app_node=
42
 app_onion_only=
42
 app_onion_only=
43
-app_port=''
43
+app_port=
44
+app_port_internal=
44
 app_daemon=
45
 app_daemon=
45
 app_dir=
46
 app_dir=
46
 your_name=''
47
 your_name=''
62
     echo $'  -r --repo [url]                      Git repo url for the app'
63
     echo $'  -r --repo [url]                      Git repo url for the app'
63
     echo $'  -c --commit [hash]                   Git commit'
64
     echo $'  -c --commit [hash]                   Git commit'
64
     echo $'     --port [number]                   Port number for the app'
65
     echo $'     --port [number]                   Port number for the app'
66
+    echo $'     --portinternal [number]           Internal port between a daemon and the web server'
65
     echo $'     --node [yes|no]                   Is this a nodejs app?'
67
     echo $'     --node [yes|no]                   Is this a nodejs app?'
66
     echo $'  -o --onion [yes|no]                  Is this app only available on an onion address?'
68
     echo $'  -o --onion [yes|no]                  Is this app only available on an onion address?'
67
     echo $'  -p --php [yes|no]                    Is this a PHP app?'
69
     echo $'  -p --php [yes|no]                    Is this a PHP app?'
131
             shift
133
             shift
132
             app_port="$1"
134
             app_port="$1"
133
             ;;
135
             ;;
136
+        --portinternal|--portint)
137
+            shift
138
+            app_port_internal="$1"
139
+            ;;
134
         --dir)
140
         --dir)
135
             shift
141
             shift
136
             app_dir="$1"
142
             app_dir="$1"
220
 echo ''
226
 echo ''
221
 echo "${app_name_upper}_DOMAIN_NAME="
227
 echo "${app_name_upper}_DOMAIN_NAME="
222
 echo "${app_name_upper}_CODE="
228
 echo "${app_name_upper}_CODE="
229
+if [ $app_port ]; then
230
+    echo "${app_name_upper}_PORT=$app_port"
231
+fi
223
 echo "${app_name_upper}_ONION_PORT=$(( ( RANDOM % 1000 )  + 9010 ))"
232
 echo "${app_name_upper}_ONION_PORT=$(( ( RANDOM % 1000 )  + 9010 ))"
224
 echo "${app_name_upper}_REPO=\"${app_repo}\""
233
 echo "${app_name_upper}_REPO=\"${app_repo}\""
225
 echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
234
 echo "${app_name_upper}_COMMIT='${app_repo_commit}'"
226
 if [ $app_daemon ]; then
235
 if [ $app_daemon ]; then
227
-    echo "${app_name_upper}_PORT=TODO"
236
+    if [ ! $app_port_internal ]; then
237
+        echo "${app_name_upper}_PORT_INTERNAL=TODO"
238
+    else
239
+        echo "${app_name_upper}_PORT_INTERNAL=$app_port_internal"
240
+    fi
228
 fi
241
 fi
229
 echo ''
242
 echo ''
230
 echo "${app_name}=(ONION_ONLY"
243
 echo "${app_name}=(ONION_ONLY"
551
 echo "    remove_app ${app_name}"
564
 echo "    remove_app ${app_name}"
552
 echo "    remove_completion_param install_${app_name}"
565
 echo "    remove_completion_param install_${app_name}"
553
 echo "    sed -i '/${app_name}/d' \$COMPLETION_FILE"
566
 echo "    sed -i '/${app_name}/d' \$COMPLETION_FILE"
554
-if [ ${#app_port} -gt 0 ]; then
567
+if [ $app_port ]; then
555
     echo ''
568
     echo ''
556
     echo "    firewall_remove ${app_port} tcp"
569
     echo "    firewall_remove ${app_port} tcp"
557
 fi
570
 fi
677
     if [ ! $app_daemon ]; then
690
     if [ ! $app_daemon ]; then
678
         echo "        echo '    try_files \$uri \$uri/ /index.html;' >> \$${app_name}_nginx_site"
691
         echo "        echo '    try_files \$uri \$uri/ /index.html;' >> \$${app_name}_nginx_site"
679
     else
692
     else
680
-        echo "        echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT;\" >> \$${app_name}_nginx_site"
693
+        echo "        echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\" >> \$${app_name}_nginx_site"
681
     fi
694
     fi
682
     echo "        echo '  }' >> \$${app_name}_nginx_site"
695
     echo "        echo '  }' >> \$${app_name}_nginx_site"
683
     echo "        echo '}' >> \$${app_name}_nginx_site"
696
     echo "        echo '}' >> \$${app_name}_nginx_site"
719
 if [ ! $app_daemon ]; then
732
 if [ ! $app_daemon ]; then
720
     echo "    echo '    try_files \$uri \$uri/ index.html;' >> \$${app_name}_nginx_site"
733
     echo "    echo '    try_files \$uri \$uri/ index.html;' >> \$${app_name}_nginx_site"
721
 else
734
 else
722
-    echo "    echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT;\" >> \$${app_name}_nginx_site"
735
+    echo "    echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\" >> \$${app_name}_nginx_site"
723
 fi
736
 fi
724
 echo "    echo '  }' >> \$${app_name}_nginx_site"
737
 echo "    echo '  }' >> \$${app_name}_nginx_site"
725
 echo "    echo '}' >> \$${app_name}_nginx_site"
738
 echo "    echo '}' >> \$${app_name}_nginx_site"
772
 echo ''
785
 echo ''
773
 echo "    \${PROJECT_NAME}-pass -u \$MY_USERNAME -a ${app_name} -p \"\$${app_name_upper}_ADMIN_PASSWORD\""
786
 echo "    \${PROJECT_NAME}-pass -u \$MY_USERNAME -a ${app_name} -p \"\$${app_name_upper}_ADMIN_PASSWORD\""
774
 echo "    set_completion_param \"${app_name} domain\" \"\$${app_name_upper}_DOMAIN_NAME\""
787
 echo "    set_completion_param \"${app_name} domain\" \"\$${app_name_upper}_DOMAIN_NAME\""
775
-if [ ${#app_port} -gt 0 ]; then
788
+if [ $app_port ]; then
776
     echo ''
789
     echo ''
777
     echo "    firewall_add ${app_name} ${app_port} tcp"
790
     echo "    firewall_add ${app_name} ${app_port} tcp"
778
 fi
791
 fi