Bob Mottram пре 7 година
родитељ
комит
179521763c
3 измењених фајлова са 11 додато и 14 уклоњено
  1. 4
    3
      src/freedombone-app-gogs
  2. 1
    1
      src/freedombone-app-rocketchat
  3. 6
    10
      src/freedombone-template

+ 4
- 3
src/freedombone-app-gogs Прегледај датотеку

@@ -39,6 +39,7 @@ GIT_CODE=
39 39
 GIT_ONION_PORT=8090
40 40
 GIT_ADMIN_PASSWORD=
41 41
 GOGS_BIN=
42
+GOGS_PORT=3145
42 43
 
43 44
 gogs_variables=(ONION_ONLY
44 45
                 GIT_ADMIN_PASSWORD
@@ -596,7 +597,7 @@ function install_gogs {
596 597
           echo '    location / {'; } >> "/etc/nginx/sites-available/${GIT_DOMAIN_NAME}"
597 598
         function_check nginx_limits
598 599
         nginx_limits "${GIT_DOMAIN_NAME}" '10G'
599
-        { echo '        proxy_pass http://localhost:3000;';
600
+        { echo "        proxy_pass http://localhost:${GOGS_PORT};";
600 601
           echo '    }';
601 602
           echo '';
602 603
           echo '    fastcgi_buffers 64 4K;';
@@ -628,7 +629,7 @@ function install_gogs {
628 629
       echo '    location / {'; } >> "/etc/nginx/sites-available/${GIT_DOMAIN_NAME}"
629 630
     function_check nginx_limits
630 631
     nginx_limits "${GIT_DOMAIN_NAME}" '10G'
631
-    { echo '        proxy_pass http://localhost:3000;';
632
+    { echo "        proxy_pass http://localhost:${GOGS_PORT};";
632 633
       echo '    }';
633 634
       echo '';
634 635
       echo '    fastcgi_buffers 64 4K;';
@@ -713,7 +714,7 @@ function install_gogs {
713 714
         echo "DOMAIN = ${GIT_ONION_HOSTNAME}" >> ${GOGS_CONFIG_FILE}
714 715
         echo "ROOT_URL = http://$GIT_DOMAIN_NAME/" >> ${GOGS_CONFIG_FILE}
715 716
     fi
716
-    { echo 'HTTP_PORT = 3000';
717
+    { echo "HTTP_PORT = ${GOGS_PORT}";
717 718
       echo "SSH_PORT = $SSH_PORT";
718 719
       echo 'SSH_DOMAIN = %(DOMAIN)s';
719 720
       echo "CERT_FILE = /etc/ssl/certs/${GIT_DOMAIN_NAME}.pem";

+ 1
- 1
src/freedombone-app-rocketchat Прегледај датотеку

@@ -33,7 +33,7 @@ SHOW_ON_ABOUT=1
33 33
 ROCKETCHAT_DOMAIN_NAME=
34 34
 ROCKETCHAT_CODE=
35 35
 ROCKETCHAT_ONION_PORT=9722
36
-ROCKETCHAT_PORT_INTERNAL=1233
36
+ROCKETCHAT_PORT_INTERNAL=3000
37 37
 
38 38
 rocketchat_variables=(ONION_ONLY
39 39
                       ROCKETCHAT_DOMAIN_NAME

+ 6
- 10
src/freedombone-template Прегледај датотеку

@@ -873,12 +873,10 @@ if [ $app_webui ]; then
873 873
         echo ''
874 874
         echo "        { echo '  add_header Strict-Transport-Security max-age=15768000;';"
875 875
         echo "          echo '';"
876
-        echo "          echo '  # Logs';"
877
-        echo "          echo '  access_log /dev/null;';"
878
-        echo "          echo '  error_log /dev/null;';"
876
+        echo "          echo '    access_log /dev/null;';"
877
+        echo "          echo '    error_log /dev/null;';"
879 878
         echo "          echo '';"
880
-        echo "          echo '  # Root';"
881
-        echo "          echo \"  root /var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs;\";"
879
+        echo "          echo \"    root /var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs;\";"
882 880
         echo "          echo '';"
883 881
         if [[ "$app_php" == 'yes' ]]; then
884 882
             echo "          echo '  index index.php;';"
@@ -920,12 +918,10 @@ if [ $app_webui ]; then
920 918
     echo "    echo '' >> \"\$${app_name}_nginx_site\""
921 919
     echo "    nginx_security_options \"\$${app_name_upper}_DOMAIN_NAME\""
922 920
     echo "    { echo '';"
923
-    echo "      echo '  # Logs';"
924
-    echo "      echo '  access_log /dev/null;';"
925
-    echo "      echo '  error_log /dev/null;';"
921
+    echo "      echo '    access_log /dev/null;';"
922
+    echo "      echo '    error_log /dev/null;';"
926 923
     echo "      echo '';"
927
-    echo "      echo '  # Root';"
928
-    echo "      echo \"  root /var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs;\";"
924
+    echo "      echo \"    root /var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs;\";"
929 925
     echo "      echo '';"
930 926
     if [[ "$app_php" == 'yes' ]]; then
931 927
         echo "      echo '  index index.php;';"