diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index 3837f3d..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://docker2:3306/main_db - - - - - - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 825dd0e..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index b135104..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 8e026d9..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/public-setupfiles.iml b/.idea/public-setupfiles.iml deleted file mode 100644 index c4142a5..0000000 --- a/.idea/public-setupfiles.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json deleted file mode 100644 index 885e3a4..0000000 --- a/.vs/VSWorkspaceState.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ExpandedNodes": [ - "" - ], - "SelectedNode": "\\updates.sh", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/.vs/public-setupfiles/FileContentIndex/c3591f47-114e-42cd-a520-c527aadfc435.vsidx b/.vs/public-setupfiles/FileContentIndex/c3591f47-114e-42cd-a520-c527aadfc435.vsidx deleted file mode 100644 index 9006e1b..0000000 Binary files a/.vs/public-setupfiles/FileContentIndex/c3591f47-114e-42cd-a520-c527aadfc435.vsidx and /dev/null differ diff --git a/.vs/public-setupfiles/FileContentIndex/read.lock b/.vs/public-setupfiles/FileContentIndex/read.lock deleted file mode 100644 index e69de29..0000000 diff --git a/.vs/public-setupfiles/v17/.wsuo b/.vs/public-setupfiles/v17/.wsuo deleted file mode 100644 index 96652d9..0000000 Binary files a/.vs/public-setupfiles/v17/.wsuo and /dev/null differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite deleted file mode 100644 index c714c21..0000000 Binary files a/.vs/slnx.sqlite and /dev/null differ diff --git a/greenbone_vas_setup/greenbone_docker-compose.yml b/docker/greenbone_vas_setup/greenbone_docker-compose.yml similarity index 100% rename from greenbone_vas_setup/greenbone_docker-compose.yml rename to docker/greenbone_vas_setup/greenbone_docker-compose.yml diff --git a/greenbone_vas_setup/install_docker.sh b/docker/greenbone_vas_setup/install_docker.sh similarity index 100% rename from greenbone_vas_setup/install_docker.sh rename to docker/greenbone_vas_setup/install_docker.sh diff --git a/greenbone_vas_setup/pull_latest_setupfile.sh b/docker/greenbone_vas_setup/pull_latest_setupfile.sh similarity index 100% rename from greenbone_vas_setup/pull_latest_setupfile.sh rename to docker/greenbone_vas_setup/pull_latest_setupfile.sh diff --git a/debian-files/install_docker_debian.sh b/docker/install_docker_debian.sh similarity index 100% rename from debian-files/install_docker_debian.sh rename to docker/install_docker_debian.sh diff --git a/ubuntu-debian-based/dockercompose_install.sh b/docker/install_docker_ubuntu.sh similarity index 89% rename from ubuntu-debian-based/dockercompose_install.sh rename to docker/install_docker_ubuntu.sh index 8f85581..5640259 100644 --- a/ubuntu-debian-based/dockercompose_install.sh +++ b/docker/install_docker_ubuntu.sh @@ -1,12 +1,14 @@ -#!/bin/bash - -# Script: install_docker_compose.sh -# Description: Script to install Docker Compose and its dependencies on Linux - # Update package lists and install dependencies sudo apt update sudo apt-get install libffi-dev libssl-dev python3-dev python3-pip -y +# Script install docker +curl -fsSL https://get.docker.com -o get-docker.sh +sh get-docker.sh + +# Script: install_docker_compose.sh +# Description: Script to install Docker Compose and its dependencies on Linux + # Install Docker Compose using pip sudo pip3 install docker-compose @@ -22,4 +24,4 @@ if [ $? -eq 0 ]; then echo "Docker Compose is installed and ready to use." else echo "Failed to install Docker Compose." -fi +fi \ No newline at end of file diff --git a/compose_files/jellyfin-docker-compose.yml b/docker/jellyfin-docker-compose.yml similarity index 100% rename from compose_files/jellyfin-docker-compose.yml rename to docker/jellyfin-docker-compose.yml diff --git a/portainer/portainer-installscript.sh b/docker/portainer/portainer-installscript.sh similarity index 100% rename from portainer/portainer-installscript.sh rename to docker/portainer/portainer-installscript.sh diff --git a/portainer/update-portainer.sh b/docker/portainer/update-portainer.sh similarity index 100% rename from portainer/update-portainer.sh rename to docker/portainer/update-portainer.sh diff --git a/old-app-setup.sh b/old-app-setup.sh deleted file mode 100644 index cd72e6e..0000000 --- a/old-app-setup.sh +++ /dev/null @@ -1,55 +0,0 @@ -!/bin/bash - -# ---------------------------------------------------------------------- -# | Add repos | -# ---------------------------------------------------------------------- - -# ---------------------------------------------------------------------- -# | Update sources | -# ---------------------------------------------------------------------- - -sudo apt-get -y update -sudo apt-get -y dist-upgrade -sudo apt-get -y full-upgrade - -# ---------------------------------------------------------------------- -# | Install apps | -# ---------------------------------------------------------------------- - -sudo apt-get -y install \ - openvpn \ - samba-common-bin \ - openssh-server \ - smbclient \ - cifs-utils \ - exfat-fuse \ - exfat-utils \ - software-properties-common \ - python \ - curl \ - unattended-upgrades \ - cron-apt \ - deja-dup \ - git \ - curl \ - snapd \ - libgconf-2-4 \ - libappindicator1 \ - - - -# ---------------------------------------------------------------------- -# | creates folders for shares, Install fstab entries, maps mounts to nas| -# ---------------------------------------------------------------------- - -sudo cp /etc/fstab /etc/ftab.orig.backup - -# cd ~/home/traver - -sudo mkdir /home/traver/naspublic -sudo mkdir /home/traver/nasdownloadedmedia - -echo "//nas/public /home/traver/naspublic cifs vers=2.0,username=admin,password=mypassword,file_mode=0777,dir_mode=0777 0 0 -//nas/DownloadedMedia /home/traver/nasdownloadedmedia cifs vers=2.0,username=traver,password=mypassword,file_mode=0777,dir_mode=0777 0 0" >> /etc/fstab - -sudo mount -a diff --git a/omv/Reset_perms.sh b/omv/Reset_perms.sh deleted file mode 100644 index d729494..0000000 --- a/omv/Reset_perms.sh +++ /dev/null @@ -1,5 +0,0 @@ -sudo mount /dev/sda1 /mnt/drive1 -sudo mount /dev/sdb1 /mnt/drive2 - -sudo chmod 777 -R /mnt/drive1 -sudo chmod 777 -R /mnt/drive2 \ No newline at end of file diff --git a/rasp2/Media_to_ap-share.sh b/raspberrypi/Media_to_ap-share.sh similarity index 100% rename from rasp2/Media_to_ap-share.sh rename to raspberrypi/Media_to_ap-share.sh diff --git a/rasp2/public_to_usb.sh b/raspberrypi/public_to_usb.sh similarity index 100% rename from rasp2/public_to_usb.sh rename to raspberrypi/public_to_usb.sh diff --git a/server_config/debian/debian-docker-install.sh b/server_config/debian/debian-docker-install.sh deleted file mode 100644 index 2774f63..0000000 --- a/server_config/debian/debian-docker-install.sh +++ /dev/null @@ -1,16 +0,0 @@ - for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done -sudo apt-get purge docker.io docker-doc docker-compose podman-docker containerd runc -sudo apt-get update -sudo apt-get install ca-certificates curl -y -sudo install -m 0755 -d /etc/apt/keyrings -sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc -sudo chmod a+r /etc/apt/keyrings/docker.asc -echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ - $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ - sudo tee /etc/apt/sources.list.d/docker.list > /dev/null -sudo apt-get update -sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y - -sudo adduser traver docker -echo "Install complete, please reboot" \ No newline at end of file diff --git a/ubuntu-debian-based/ubuntu_install_apps.sh b/ubuntu-based/ubuntu_install_apps.sh similarity index 100% rename from ubuntu-debian-based/ubuntu_install_apps.sh rename to ubuntu-based/ubuntu_install_apps.sh