ソースを参照

Internal port

Bob Mottram 7 年 前
コミット
08a14be3f6
共有1 個のファイルを変更した19 個の追加6 個の削除を含む
  1. 19
    6
      src/freedombone-template

+ 19
- 6
src/freedombone-template ファイルの表示

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