Przeglądaj źródła

port within app script generator

Bob Mottram 7 lat temu
rodzic
commit
51ceb967a5
1 zmienionych plików z 14 dodań i 4 usunięć
  1. 14
    4
      src/freedombone-template

+ 14
- 4
src/freedombone-template Wyświetl plik

@@ -38,6 +38,7 @@ app_repo="TODO"
38 38
 app_repo_commit='TODO'
39 39
 app_php=
40 40
 app_node=
41
+app_port=''
41 42
 your_name=''
42 43
 your_email=''
43 44
 SHOW_ON_ABOUT=1
@@ -56,6 +57,7 @@ function show_help {
56 57
     echo $'  -e --email [address]                 Your email address'
57 58
     echo $'  -r --repo [url]                      Git repo url for the app'
58 59
     echo $'  -c --commit [hash]                   Git commit'
60
+    echo $'     --port [number]                   Port number for the app'
59 61
     echo $'     --node [yes|no]                   Is this a nodejs app?'
60 62
     echo $'  -p --php [yes|no]                    Is this a PHP app?'
61 63
     echo $'  -d --database [mariadb|postgresql]   Type of database'
@@ -106,6 +108,10 @@ do
106 108
             shift
107 109
             app_node="$1"
108 110
             ;;
111
+        --port)
112
+            shift
113
+            app_port="$1"
114
+            ;;
109 115
         *)
110 116
             # unknown option
111 117
             ;;
@@ -482,10 +488,10 @@ echo '    fi'
482 488
 echo "    remove_app ${app_name}"
483 489
 echo "    remove_completion_param install_${app_name}"
484 490
 echo "    sed -i '/${app_name}/d' \$COMPLETION_FILE"
485
-echo ''
486
-echo "    if grep -q '${app_name}-firewall' /etc/crontab; then"
487
-echo "        sed -i '/${app_name}-firewall/d' /etc/crontab"
488
-echo '    fi'
491
+if [ ${#app_port} -gt 0 ]; then
492
+    echo ''
493
+    echo "    firewall_remove ${app_port} tcp"
494
+fi
489 495
 echo ''
490 496
 echo "    remove_ddns_domain \$${app_name_upper}_DOMAIN_NAME"
491 497
 echo '}'
@@ -643,6 +649,10 @@ echo '    systemctl restart nginx'
643 649
 echo ''
644 650
 echo "    \${PROJECT_NAME}-pass -u \$MY_USERNAME -a ${app_name} -p \"\$${app_name_upper}_ADMIN_PASSWORD\""
645 651
 echo "    set_completion_param \"${app_name} domain\" \"\$${app_name_upper}_DOMAIN_NAME\""
652
+if [ ${#app_port} -gt 0 ]; then
653
+    echo ''
654
+    echo "    firewall_add ${app_name} ${app_port} tcp"
655
+fi
646 656
 echo ''
647 657
 echo '    APP_INSTALLED=1'
648 658
 echo '}'