Merge branch 'master' into testing

This commit is contained in:
TangoBravo14
2019-09-21 13:01:03 -07:00
2 changed files with 23 additions and 3 deletions
+20 -3
View File
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
######################## AmRRON Setup Script v0.5.7 ########################
######################## AmRRON Setup Script v0.5.8 ########################
######################## Created by TB-14 ########################
######################## 18 Aug 2019 ########################
######################## 21 SEP 2019 ########################
################################################################################
################################################################################
#
@@ -289,6 +289,15 @@ if hash filezilla 2>/dev/null; then
else
FZVER="NOT INSTALLED"
fi
if hash gtkhash 2>/dev/null; then
GTKHASHVER="INSTALLED"
else
GTKHASHVER="NOT INSTALLED"
fi
}
@@ -2277,6 +2286,10 @@ function iceweasel_install() {
sudo apt-get install -y iceweasel
}
function gtkhash_install() {
sudo apt-get install -y gtkhash
}
function harden_ssh() {
if [[ ! -f $HOME/.ssh/authorized_keys ]]; then
mkdir -p $HOME/.ssh/ && touch $HOME/.ssh/authorized_keys ||
@@ -2809,6 +2822,7 @@ yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator=""
false "KEEPASS" "KepassXC password manager" "${KEEPASSXCVER}" \
false "ICEWEASEL" "Firefox secure browser" "${ICEWEASELVER}" \
false "PFE" "Paranoia Tools File Encrypter. Encrypt/Decrypt messages and perform Steganography" "${PTEVER}" \
false "GTKHASH" "GTK based file hash tool" "${GTKHASHVER}" \
false "VERACRYPT" "Disk/File Encryption. $NEWVC available for Linux. 1.21 available for Raspberry Pi at this time." "" \
false "BITMESSAGE" "Bitmessage secure decentralized email" "" \
false "HARDEN_SSH" "Change folder permissions and provide SSH tips document." "" \
@@ -2820,7 +2834,7 @@ yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator=""
rc=$?
if [[ $rc == 2 ]]; then
securityArray=(FAIL2BAN KEEPASS ICEWEASEL PFE VERACRYPT BITMESSAGE HARDEN_SSH)
securityArray=(FAIL2BAN KEEPASS ICEWEASEL PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH)
for i in "${securityArray[@]}"
do
@@ -3281,6 +3295,9 @@ cat /tmp/results | yad --text-info --center \
ICEWEASEL) echo "Installing iceweasel"
iceweasel_install
;;
GTKHASH) echo "Installing GTK Hash"
gtkhash_install
;;
HARDEN_SSH) echo "Hardening SSH and creating guide at $HOME/Documents"
harden_ssh
;;
+3
View File
@@ -1,3 +1,6 @@
# Version 0.5.8
- Added Security Tools - GTK Hash
# Version 0.5.7
- Added Other Tools - VIM and Filezilla