Merge 50beeef63a into 6faf600d40

install.sh

@@ -3,10 +3,10 @@
 
 print_help() {
   echo "Usage: $0 [-s y|n] [-t h|s|l|i|m|t] -u <webuser name> -p <password for web user>"
-  echo "  -s: Supress Install(y/n) question. Value accepted: yes or no (optional)"
+  echo "  -s: yes or no (optional)"
-  echo "  -t: Type of installation. Value accepted: h (hive),s (sensor), l (llm), i(mini),m(mobile),t(tarpit) (optional)"
+  echo "  -t: h (host),s (sensor), l (llm), i(mini),m(mobile),t(tarpit) (optional)"
-  echo "  -u: web username (mandatory for hive installation, otherwirse optional)"
+  echo "  -u: web username (optional)"
-  echo "  -p: password for web user (mandatory for hive installation, otherwirse optional)"
+  echo "  -p: password for web user (optional)"
   exit 1
 }
 

installer/install/tpot.yml

@@ -478,21 +478,6 @@
       tags:
         - "Ubuntu"
 
-    - name: Comment out Port(s) in sshd_config, can cause port conflicts on deploy (AlmaLinux, Debian, Fedora, openSUSE Tumbleweed, Raspbian, Rocky, Ubuntu)
-      ansible.builtin.replace:
-        path: /etc/ssh/sshd_config
-        regexp: '^(Port (?!64295$)[0-9]+)'
-        replace: '# \1'
-      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
-      tags:
-        - "AlmaLinux"
-        - "Debian"
-        - "Fedora"
-        - "openSUSE Tumbleweed"
-        - "Raspbian"
-        - "Rocky"
-        - "Ubuntu"
-
     - name: Change SSH Port to 64295 (AlmaLinux, Debian, Fedora, Raspbian, Rocky, Ubuntu)
       lineinfile:
         path: /etc/ssh/sshd_config

installer/remove/tpot.yml

@@ -215,21 +215,6 @@
         - "Rocky"
         - "Ubuntu"
 
-    - name: Revert Comment out Port(s) in sshd_config, can cause port conflicts on deploy (AlmaLinux, Debian, Fedora, openSUSE Tumbleweed, Raspbian, Rocky, Ubuntu)
-      ansible.builtin.replace:
-        path: /etc/ssh/sshd_config
-        regexp: '^# (Port (?!22$)[0-9]+)'
-        replace: '\1'
-      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
-      tags:
-        - "AlmaLinux"
-        - "Debian"
-        - "Fedora"
-        - "openSUSE Tumbleweed"
-        - "Raspbian"
-        - "Rocky"
-        - "Ubuntu"
-
     - name: Remove vm.max_map_count setting (All)
       lineinfile:
         path: /etc/sysctl.conf

update.sh

@@ -188,10 +188,6 @@ function fuRESTORE () {
 	fi
 	echo "### Restoring T-Pot config file .env"
 	tar xvf $myARCHIVE .env -C $HOME/tpotce >/dev/null 2>&1
-	# Backup file (.env) contains a record of the TPOT_VERSION that is used in docker-compose commmands. 
-	# We should upgrade the version in this file after restoring the backup.
-	newVERSION=$(cat version)
-	sed -i "s/^TPOT_VERSION=.*/TPOT_VERSION=${newVERSION}/" $HOME/tpotce/.env
 }
 
 ################