Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-04-19 21:52:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tweaking

Browse source
This commit is contained in:
Marco Ochse 2024-03-24 16:59:02 +01:00
parent 3a81e988da
commit e2d9362f8a
5 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug-report-for-t-pot.md vendored
View file

@ -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). - 📚 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**.<br> - **⚠️ 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**.<br>
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`) # ⚠️ 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.** **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 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 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.)? - 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? - How long has your installation been running?
- If it is a fresh install consult the documentation first. - If it is a fresh install consult the documentation first.
- Most likely it is a port conflict or a remote dependency was unavailable. - Most likely it is a port conflict or a remote dependency was unavailable.

4
.github/ISSUE_TEMPLATE/general-issue-for-t-pot.md vendored
View file

@ -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). - 📚 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**.<br> - **⚠️ 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**.<br>
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`) # ⚠️ 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.** **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 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 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.)? - 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? - How long has your installation been running?
- If it is a fresh install consult the documentation first. - If it is a fresh install consult the documentation first.
- Most likely it is a port conflict or a remote dependency was unavailable. - Most likely it is a port conflict or a remote dependency was unavailable.

2
install.sh
View file

@ -149,7 +149,7 @@ fi
# Run Ansible Playbook # Run Ansible Playbook
echo "### Now running T-Pot Ansible Installation Playbook ..." echo "### Now running T-Pot Ansible Installation Playbook ..."
echo 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 # Something went wrong
if [ ! $? -eq 0 ]; if [ ! $? -eq 0 ];

28
installer/remove/tpot.yml
View file

@ -43,7 +43,7 @@
# T-Pot - Remove cron job and service # # T-Pot - Remove cron job and service #
####################################### #######################################
- name: Reverse T-Pot - Remove randomized daily reboot - name: Remove T-Pot daily reboot
hosts: all hosts: all
gather_facts: true gather_facts: true
become: true become: true
@ -64,7 +64,7 @@
state: absent state: absent
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"] 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 hosts: all
gather_facts: true gather_facts: true
become: true become: true
@ -83,6 +83,7 @@
name: tpot.service name: tpot.service
state: stopped state: stopped
enabled: no enabled: no
ignore_errors: yes
when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"] when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
- name: Remove systemd service file for tpot - name: Remove systemd service file for tpot
@ -102,7 +103,7 @@
# T-Pot - Adjust bashrc, remove T-Pot repository # # T-Pot - Adjust bashrc, remove T-Pot repository #
################################################## ##################################################
- name: T-Pot - Reverse Adjustments - name: T-Pot - Revert Adjustments
hosts: all hosts: all
gather_facts: true gather_facts: true
become: true become: true
@ -285,6 +286,20 @@
- "Rocky" - "Rocky"
- "Ubuntu" - "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 # # T-Pot - Remove Docker Engine Repos #
###################################### ######################################
@ -295,9 +310,9 @@
become: true become: true
tasks: tasks:
- name: Remove Docker Engine repository (Debian, Raspbian, Ubuntu) - name: Remove Docker Engine repository file (Debian, Raspbian, Ubuntu)
apt_repository: file:
filename: docker path: /etc/apt/sources.list.d/docker.list
state: absent state: absent
when: ansible_distribution in ["Debian", "Raspbian", "Ubuntu"] when: ansible_distribution in ["Debian", "Raspbian", "Ubuntu"]
tags: tags:
@ -317,4 +332,3 @@
tags: tags:
- "AlmaLinux" - "AlmaLinux"
- "Rocky" - "Rocky"

6
uninstall.sh
View file

@ -79,7 +79,7 @@ fi
# Run Ansible Playbook # Run Ansible Playbook
echo "### Now running T-Pot Ansible Uninstallation Playbook ..." echo "### Now running T-Pot Ansible Uninstallation Playbook ..."
echo 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 # Something went wrong
if [ ! $? -eq 0 ]; if [ ! $? -eq 0 ];
@ -90,8 +90,8 @@ if [ ! $? -eq 0 ];
exit 1 exit 1
else else
echo "### Playbook was successful." echo "### Playbook was successful."
echo "### Now removing $HOME/tpotce." echo "### Now removing ${HOME}/tpotce."
rm -rf $HOME/tpotce rm -rf ${HOME}/tpotce
echo echo
fi fi