diff --git a/.github/ISSUE_TEMPLATE/bug-report-for-t-pot.md b/.github/ISSUE_TEMPLATE/bug-report-for-t-pot.md
index cdba5ea0..30f39ec5 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-for-t-pot.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-for-t-pot.md
@@ -15,8 +15,6 @@ Before you post your issue make sure it has not been answered yet and provide **
- 📚 Consult the documentation of 💻 your Linux OS, 🐳 [Docker](https://docs.docker.com/), the 🦌 [Elastic stack](https://www.elastic.co/guide/index.html) and the 🍯 [T-Pot Readme](https://github.com/dtag-dev-sec/tpotce/blob/master/README.md).
- **⚠️ Provide [BASIC SUPPORT INFORMATION](#-basic-support-information-commands-are-expected-to-run-as-root) or similar detailed information with regard to your issue or we will close the issue or convert it into a discussion without further interaction from the maintainers**.
-Questions such as **"Not seeing any attacks, containers are running fine"** or **"Cannot connect to the T-Pot WebUI, containers are running just fine"** are most likely caused by failures in routing and / or firewall setup and belong into the T-Pot [discussions](https://github.com/telekom-security/tpotce/discussions).
-
# ⚠️ Basic support information (commands are expected to run as `root`)
**We happily take the time to improve T-Pot and take care of things, but we need you to take the time to create an issue that provides us with all the information we need.**
@@ -25,7 +23,7 @@ Questions such as **"Not seeing any attacks, containers are running fine"** or *
- What is the version of the OS `lsb_release -a` and `uname -a`?
- What T-Pot version are you currently using (only **T-Pot 24.04.x** is currently supported)?
- What architecture are you running on (i.e. hardware, cloud, VM, etc.)?
-- Review the `~/tpotce/install_tpot.log`, attach the log and highlight the errors.
+- Review the `~/install_tpot.log`, attach the log and highlight the errors.
- How long has your installation been running?
- If it is a fresh install consult the documentation first.
- Most likely it is a port conflict or a remote dependency was unavailable.
diff --git a/.github/ISSUE_TEMPLATE/general-issue-for-t-pot.md b/.github/ISSUE_TEMPLATE/general-issue-for-t-pot.md
index fe2abd7f..648689df 100644
--- a/.github/ISSUE_TEMPLATE/general-issue-for-t-pot.md
+++ b/.github/ISSUE_TEMPLATE/general-issue-for-t-pot.md
@@ -15,8 +15,6 @@ Before you post your issue make sure it has not been answered yet and provide **
- 📚 Consult the documentation of 💻 your Linux OS, 🐳 [Docker](https://docs.docker.com/), the 🦌 [Elastic stack](https://www.elastic.co/guide/index.html) and the 🍯 [T-Pot Readme](https://github.com/dtag-dev-sec/tpotce/blob/master/README.md).
- **⚠️ Provide [BASIC SUPPORT INFORMATION](#-basic-support-information-commands-are-expected-to-run-as-root) or similar detailed information with regard to your issue or we will close the issue or convert it into a discussion without further interaction from the maintainers**.
-Questions such as **"Not seeing any attacks, containers are running fine"** or **"Cannot connect to the T-Pot WebUI, containers are running just fine"** are most likely caused by failures in routing and / or firewall setup and belong into the T-Pot [discussions](https://github.com/telekom-security/tpotce/discussions).
-
# ⚠️ Basic support information (commands are expected to run as `root`)
**We happily take the time to improve T-Pot and take care of things, but we need you to take the time to create an issue that provides us with all the information we need.**
@@ -25,7 +23,7 @@ Questions such as **"Not seeing any attacks, containers are running fine"** or *
- What is the version of the OS `lsb_release -a` and `uname -a`?
- What T-Pot version are you currently using (only **T-Pot 24.04.x** is currently supported)?
- What architecture are you running on (i.e. hardware, cloud, VM, etc.)?
-- Review the `~/tpotce/install_tpot.log`, attach the log and highlight the errors.
+- Review the `~/install_tpot.log`, attach the log and highlight the errors.
- How long has your installation been running?
- If it is a fresh install consult the documentation first.
- Most likely it is a port conflict or a remote dependency was unavailable.
diff --git a/install.sh b/install.sh
index 0b2796c7..42179cc2 100755
--- a/install.sh
+++ b/install.sh
@@ -149,7 +149,7 @@ fi
# Run Ansible Playbook
echo "### Now running T-Pot Ansible Installation Playbook ..."
echo
-ANSIBLE_LOG_PATH=${PWD}/install_tpot.log ansible-playbook ${myANSIBLE_TPOT_PLAYBOOK} -i 127.0.0.1, -c local --tags "${myANSIBLE_TAG}" ${myANSIBLE_BECOME_OPTION}
+ANSIBLE_LOG_PATH=${HOME}/install_tpot.log ansible-playbook ${myANSIBLE_TPOT_PLAYBOOK} -i 127.0.0.1, -c local --tags "${myANSIBLE_TAG}" ${myANSIBLE_BECOME_OPTION}
# Something went wrong
if [ ! $? -eq 0 ];
diff --git a/installer/remove/tpot.yml b/installer/remove/tpot.yml
index 304e2d48..85bad48e 100644
--- a/installer/remove/tpot.yml
+++ b/installer/remove/tpot.yml
@@ -43,7 +43,7 @@
# T-Pot - Remove cron job and service #
#######################################
-- name: Reverse T-Pot - Remove randomized daily reboot
+- name: Remove T-Pot daily reboot
hosts: all
gather_facts: true
become: true
@@ -64,7 +64,7 @@
state: absent
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
-- name: Reverse T-Pot - Remove systemd service
+- name: Remove T-Pot systemd service
hosts: all
gather_facts: true
become: true
@@ -83,6 +83,7 @@
name: tpot.service
state: stopped
enabled: no
+ ignore_errors: yes
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
- name: Remove systemd service file for tpot
@@ -102,7 +103,7 @@
# T-Pot - Adjust bashrc, remove T-Pot repository #
##################################################
-- name: T-Pot - Reverse Adjustments
+- name: T-Pot - Revert Adjustments
hosts: all
gather_facts: true
become: true
@@ -285,6 +286,20 @@
- "Rocky"
- "Ubuntu"
+ - name: Remove /var/lib/docker directory
+ file:
+ path: /var/lib/docker
+ state: absent
+ when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
+ tags:
+ - "AlmaLinux"
+ - "Debian"
+ - "Fedora"
+ - "openSUSE Tumbleweed"
+ - "Raspbian"
+ - "Rocky"
+ - "Ubuntu"
+
######################################
# T-Pot - Remove Docker Engine Repos #
######################################
@@ -295,11 +310,11 @@
become: true
tasks:
- - name: Remove Docker Engine repository (Debian, Raspbian, Ubuntu)
- apt_repository:
- filename: docker
+ - name: Remove Docker Engine repository file (Debian, Raspbian, Ubuntu)
+ file:
+ path: /etc/apt/sources.list.d/docker.list
state: absent
- when: ansible_distribution in ["Debian", "Raspbian", "Ubuntu"]
+ when: ansible_distribution in ["Debian", "Raspbian", "Ubuntu"]
tags:
- "Debian"
- "Raspbian"
@@ -317,4 +332,3 @@
tags:
- "AlmaLinux"
- "Rocky"
-
diff --git a/uninstall.sh b/uninstall.sh
index 740a0bcc..f33987a8 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -79,7 +79,7 @@ fi
# Run Ansible Playbook
echo "### Now running T-Pot Ansible Uninstallation Playbook ..."
echo
-ANSIBLE_LOG_PATH=${PWD}/uninstall_tpot.log ansible-playbook ${myANSIBLE_TPOT_PLAYBOOK} -i 127.0.0.1, -c local --tags "${myANSIBLE_TAG}" ${myANSIBLE_BECOME_OPTION}
+ANSIBLE_LOG_PATH=${HOME}/uninstall_tpot.log ansible-playbook ${myANSIBLE_TPOT_PLAYBOOK} -i 127.0.0.1, -c local --tags "${myANSIBLE_TAG}" ${myANSIBLE_BECOME_OPTION}
# Something went wrong
if [ ! $? -eq 0 ];
@@ -90,8 +90,8 @@ if [ ! $? -eq 0 ];
exit 1
else
echo "### Playbook was successful."
- echo "### Now removing $HOME/tpotce."
- rm -rf $HOME/tpotce
+ echo "### Now removing ${HOME}/tpotce."
+ rm -rf ${HOME}/tpotce
echo
fi