diff --git a/README.md b/README.md index d4ae9be..eb0d5e7 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,5 @@ Sample Commands bash minstall.sh http-install-mysql bash minstall.sh http-install-nginx bash minstall.sh http-install-php - bash minstall.sh http-install-php-extra bash minstall.sh http-configure-mysql bash minstall.sh http-configure-nginx diff --git a/documents/Module Examples.txt b/documents/Module Examples.txt deleted file mode 100644 index 650339d..0000000 --- a/documents/Module Examples.txt +++ /dev/null @@ -1,8 +0,0 @@ -Here are a few sample module configurations. -Copy and paste the sample you'd like to use into config.ini (replace the existing modules list) and modify to your liking. - -; Sample 1 - Minimalist install, using OpenSSH as SSH server. -modules="install-extra-repositories,clean-packages,install-ssh,install-extra-packages,configure-general,configure-ssh,configure-user" - -; Sample 2 - Complete install of a web server LEMP stack (Linux nginx MySQL PHP), using Dropbear as SSH server and one added user. -modules="install-extra-repositories,clean-packages,install-dropbear,install-extra-packages,configure-general,configure-ssh,configure-user,http-install-exim,http-install-mysql,http-install-nginx,http-install-php,http-install-php-extra,http-configure-mysql,http-configure-nginx,manage-add-user" diff --git a/documents/Using Extra Scripts.txt b/documents/Using Extra Scripts.txt index eab03aa..2cb6e3f 100644 --- a/documents/Using Extra Scripts.txt +++ b/documents/Using Extra Scripts.txt @@ -1,5 +1,4 @@ -Minstall includes some extra scripts, two examples being the benchmark enviroment setup script and the phpMyAdmin script. -These scripts may be used independantly to Minstall and aren't dependant on it. +Minstall includes some extra scripts. These scripts may be used independantly to Minstall and aren't dependant on it. Some may however require the changing of parameters in the script files to ensure proper setup and operation. Please be sure to understand what each script does and update the variables in the variable section of each script before using. Hopefully you'll find the scripts useful! diff --git a/extra/benchmark-tools.sh b/extra/benchmark-tools.sh deleted file mode 100755 index 96c7026..0000000 --- a/extra/benchmark-tools.sh +++ /dev/null @@ -1,166 +0,0 @@ -#!/bin/bash -# Installs basic benchmarking utilities. - -########### -## Setup ## -########### - -# Change File Settings -shopt -s dotglob - -# Update Package List -apt-get update - -# Install Essential Build Utilities -apt-get -q -y install build-essential - -# Make Tool Directory -mkdir ~/benchmark - -# Change To Directory -cd ~/benchmark - -############### -## Geekbench ## -############### - -# Create Directory -mkdir geekbench - -# Change To Directory -cd geekbench - -# Download Geekbench -wget http://www.primatelabs.ca/download/Geekbench-2.1.13-Linux.tar.gz - -# Extract Executables -tar xfvz Geekbench-*.tar.gz - -# Move Executables -mv dist/*/* . - -# Remove Temp -rm -rf dist Geekbench-*.tar.gz - -# Create Shell Script (x32) -echo -e '#!/bin/bash\ncd $(dirname $0)/geekbench\n./geekbench_x86_32' > ../geekbench32.sh - -# Create Shell Script (x32) -echo -e '#!/bin/bash\ncd $(dirname $0)/geekbench\n./geekbench_x86_64' > ../geekbench64.sh - -# Exit Directory -cd .. - -############ -## IOPing ## -############ - -# Create Directory -mkdir ioping - -# Change To Directory -cd ioping - -# Download Source -wget https://ioping.googlecode.com/files/ioping-0.6.tar.gz - -# Extract Source -tar xfvz ioping-*.tar.gz - -# Move Source -mv ioping-*/* . - -# Remove Temp -rm -rf ioping-* - -# Compile -make - -# Create Shell Script -echo -e '#!/bin/bash\ncd $(dirname $0)/ioping\n./ioping -c 10 .' > ../ioping.sh - -# Exit Directory -cd .. - -############## -## Packages ## -############## - -# lshw Hardware Info -apt-get -q -y install lshw - -# lshw Hardware Info Script -echo -e '#!/bin/bash\nlshw' > lshw.sh - -# sysbench Benchmark -apt-get -q -y install sysbench - -# sysstat Performance Monitoring -apt-get -q -y install sysstat - -#################### -## Scripts (Info) ## -#################### - -# CPU Info -echo -e '#!/bin/bash\ncat /proc/cpuinfo' > cpuinfo.sh - -# Memory Info -echo -e '#!/bin/bash\ncat /proc/meminfo' > meminfo.sh - -# Inode Allocation Info -echo -e '#!/bin/bash\ndf -i' > inode.sh - -# vmstat Info -echo -e '#!/bin/bash\nvmstat' > vmstat.sh - -##################### -## Scripts (Tests) ## -##################### - -# Cachefly Network Download Test -echo -e '#!/bin/bash\nwget -O /dev/null http://cachefly.cachefly.net/100mb.test' > wget.sh - -# DD Disk Test Script -echo -e '#!/bin/bash\ndd if=/dev/zero of=test bs=64k count=16k conv=fdatasync; rm test' > dd.sh - -# Ping Tests -echo -e '#!/bin/bash\nping -c 5 google.com' > ping.sh - -# Ping Tests -echo -e '#!/bin/bash\nping6 -c 5 google.com' > ping6.sh - -################ -## UNIX Bench ## -################ - -# Create Directory -mkdir unixbench - -# Change To Directory -cd unixbench - -# Download Source -wget https://byte-unixbench.googlecode.com/files/UnixBench5.1.3.tgz - -# Extract Source -tar xfvz UnixBench*.tgz - -# Move Source -mv UnixBench/* . - -# Remove Temp -rm -rf UnixBench UnixBench*.tgz - -# Create Shell Script -echo -e '#!/bin/bash\ncd $(dirname $0)/unixbench\n./Run' > ../unixbench.sh - -# Exit Directory -cd .. - -################## -## Finalisation ## -################## - -# Change Permissions -chmod +x *.sh diff --git a/extra/install-phpmyadmin.sh b/extra/script-phpmyadmin.sh similarity index 100% rename from extra/install-phpmyadmin.sh rename to extra/script-phpmyadmin.sh diff --git a/libraries/20.package.sh b/libraries/20.package.sh index 9eb6dd0..2dc6fa4 100755 --- a/libraries/20.package.sh +++ b/libraries/20.package.sh @@ -18,21 +18,3 @@ function package_update_question() { PACKAGE_LIST_UPDATE=1 fi } - -# Set Package List Clean Variable -PACKAGE_LIST_CLEAN=0 - -# Package List Clean Question -function package_clean_question() { - # Check If Package List Clean Needs To Be Run - if [ $PACKAGE_LIST_CLEAN = 1 ] && [ "$1" = "1" ]; then - # Ask Question - if question --default yes "Do you want to clean the package cache? (Y/n)" || [[ $UNATTENDED = 1 && $(read_var minstall__package_clean) = 1 ]]; then - # Clean Package Cache - package_clean - fi - fi - - # Set Package List Clean Variable - PACKAGE_LIST_CLEAN=1 -} diff --git a/minstall.sh b/minstall.sh index d1826ba..c0b5ea1 100755 --- a/minstall.sh +++ b/minstall.sh @@ -74,7 +74,7 @@ if [ $UNATTENDED = 0 ]; then # Help Function help) # Load Help Script - source $MODULEPATH/help.sh + source $MODULEPATH/help/init.sh # Exit exit @@ -82,7 +82,7 @@ if [ $UNATTENDED = 0 ]; then # Module List Function modules) # Load Module Listing Script - source $MODULEPATH/help-modules.sh + source $MODULEPATH/help-modules/init.sh # Exit exit @@ -101,12 +101,12 @@ if [ $UNATTENDED = 0 ]; then MODULELIST=${MODULELIST#*\,} # Check If Module Exists - if [ -f $MODULEPATH/$MODULE.sh ]; then + if [ -f $MODULEPATH/$MODULE/init.sh ]; then # Print Module Description - header $(describe $MODULEPATH/$MODULE.sh) + header $(describe $MODULEPATH/$MODULE/init.sh) # Load Module - source $MODULEPATH/$MODULE.sh + source $MODULEPATH/$MODULE/init.sh # Module Doesn't Exist else # Ask If User Wants To Abort @@ -152,12 +152,12 @@ if [ $UNATTENDED = 1 ]; then fi # Check If Module Exists - if [ -f $MODULEPATH/$MODULE.sh ]; then + if [ -f $MODULEPATH/$MODULE/init.sh ]; then # Print Module Description - header $(describe $MODULEPATH/$MODULE.sh) + header $(describe $MODULEPATH/$MODULE/init.sh) # Load Module - source $MODULEPATH/$MODULE.sh + source $MODULEPATH/$MODULE/init.sh # Module Doesn't Exist else # Print Message diff --git a/modules/clean-packages.sh b/modules/clean-packages/init.sh similarity index 100% rename from modules/clean-packages.sh rename to modules/clean-packages/init.sh diff --git a/modules/configure-upgrade/config.ini b/modules/clean-upgrade/config.ini similarity index 100% rename from modules/configure-upgrade/config.ini rename to modules/clean-upgrade/config.ini diff --git a/modules/configure-upgrade.sh b/modules/clean-upgrade/init.sh similarity index 100% rename from modules/configure-upgrade.sh rename to modules/clean-upgrade/init.sh diff --git a/modules/http-configure-mysql/config.ini b/modules/configure-database-mysql/config.ini similarity index 100% rename from modules/http-configure-mysql/config.ini rename to modules/configure-database-mysql/config.ini diff --git a/modules/http-configure-mysql.sh b/modules/configure-database-mysql/init.sh similarity index 100% rename from modules/http-configure-mysql.sh rename to modules/configure-database-mysql/init.sh diff --git a/modules/http-configure-mysql/mysql/conf.d/disable_innodb.cnf b/modules/configure-database-mysql/mysql/conf.d/disable_innodb.cnf similarity index 100% rename from modules/http-configure-mysql/mysql/conf.d/disable_innodb.cnf rename to modules/configure-database-mysql/mysql/conf.d/disable_innodb.cnf diff --git a/modules/http-configure-mysql/mysql/conf.d/minimal.cnf b/modules/configure-database-mysql/mysql/conf.d/minimal.cnf similarity index 100% rename from modules/http-configure-mysql/mysql/conf.d/minimal.cnf rename to modules/configure-database-mysql/mysql/conf.d/minimal.cnf diff --git a/modules/configure-general/config.ini b/modules/configure-general-server/config.ini similarity index 100% rename from modules/configure-general/config.ini rename to modules/configure-general-server/config.ini diff --git a/modules/configure-general.sh b/modules/configure-general-server/init.sh similarity index 100% rename from modules/configure-general.sh rename to modules/configure-general-server/init.sh diff --git a/modules/configure-user/config.ini b/modules/configure-general-user/config.ini similarity index 100% rename from modules/configure-user/config.ini rename to modules/configure-general-user/config.ini diff --git a/modules/configure-user/debian/.bashrc b/modules/configure-general-user/debian/.bashrc similarity index 100% rename from modules/configure-user/debian/.bashrc rename to modules/configure-general-user/debian/.bashrc diff --git a/modules/configure-user/debian/.profile b/modules/configure-general-user/debian/.profile similarity index 100% rename from modules/configure-user/debian/.profile rename to modules/configure-general-user/debian/.profile diff --git a/modules/configure-user.sh b/modules/configure-general-user/init.sh similarity index 100% rename from modules/configure-user.sh rename to modules/configure-general-user/init.sh diff --git a/modules/configure-user/ubuntu/.bashrc b/modules/configure-general-user/ubuntu/.bashrc similarity index 100% rename from modules/configure-user/ubuntu/.bashrc rename to modules/configure-general-user/ubuntu/.bashrc diff --git a/modules/configure-user/ubuntu/.profile b/modules/configure-general-user/ubuntu/.profile similarity index 100% rename from modules/configure-user/ubuntu/.profile rename to modules/configure-general-user/ubuntu/.profile diff --git a/modules/http-configure-nginx/config.ini b/modules/configure-http-nginx/config.ini similarity index 100% rename from modules/http-configure-nginx/config.ini rename to modules/configure-http-nginx/config.ini diff --git a/modules/http-configure-nginx.sh b/modules/configure-http-nginx/init.sh similarity index 100% rename from modules/http-configure-nginx.sh rename to modules/configure-http-nginx/init.sh diff --git a/modules/http-configure-nginx/nginx/hosts.d/default-ssl.conf b/modules/configure-http-nginx/nginx/hosts.d/default-ssl.conf similarity index 100% rename from modules/http-configure-nginx/nginx/hosts.d/default-ssl.conf rename to modules/configure-http-nginx/nginx/hosts.d/default-ssl.conf diff --git a/modules/http-configure-nginx/nginx/hosts.d/default.conf b/modules/configure-http-nginx/nginx/hosts.d/default.conf similarity index 100% rename from modules/http-configure-nginx/nginx/hosts.d/default.conf rename to modules/configure-http-nginx/nginx/hosts.d/default.conf diff --git a/modules/http-configure-nginx/nginx/nginx.d/cache.conf b/modules/configure-http-nginx/nginx/nginx.d/cache.conf similarity index 100% rename from modules/http-configure-nginx/nginx/nginx.d/cache.conf rename to modules/configure-http-nginx/nginx/nginx.d/cache.conf diff --git a/modules/http-configure-nginx/nginx/nginx.d/cache_ssl.conf b/modules/configure-http-nginx/nginx/nginx.d/cache_ssl.conf similarity index 100% rename from modules/http-configure-nginx/nginx/nginx.d/cache_ssl.conf rename to modules/configure-http-nginx/nginx/nginx.d/cache_ssl.conf diff --git a/modules/http-configure-nginx/nginx/nginx.d/gzip.conf b/modules/configure-http-nginx/nginx/nginx.d/gzip.conf similarity index 100% rename from modules/http-configure-nginx/nginx/nginx.d/gzip.conf rename to modules/configure-http-nginx/nginx/nginx.d/gzip.conf diff --git a/modules/configure-ssh/config.ini b/modules/configure-terminal-ssh/config.ini similarity index 100% rename from modules/configure-ssh/config.ini rename to modules/configure-terminal-ssh/config.ini diff --git a/modules/configure-ssh.sh b/modules/configure-terminal-ssh/init.sh similarity index 100% rename from modules/configure-ssh.sh rename to modules/configure-terminal-ssh/init.sh diff --git a/modules/help-modules.sh b/modules/help-modules/init.sh similarity index 70% rename from modules/help-modules.sh rename to modules/help-modules/init.sh index ecbd26e..0344db8 100755 --- a/modules/help-modules.sh +++ b/modules/help-modules/init.sh @@ -5,6 +5,6 @@ header "Module Name - Description" # Loop Through Modules -for file in $MODULEPATH/*.sh; do - list $file +for module in $MODULEPATH/*/init.sh; do + list $module done diff --git a/modules/help.sh b/modules/help/init.sh similarity index 100% rename from modules/help.sh rename to modules/help/init.sh diff --git a/modules/http-install-exim/config.ini b/modules/install-database-mariadb/config.ini similarity index 100% rename from modules/http-install-exim/config.ini rename to modules/install-database-mariadb/config.ini diff --git a/modules/http-install-nginx/config.ini b/modules/install-database-mariadb/init.sh similarity index 100% rename from modules/http-install-nginx/config.ini rename to modules/install-database-mariadb/init.sh diff --git a/modules/http-install-mysql/config.ini b/modules/install-database-mysql/config.ini similarity index 100% rename from modules/http-install-mysql/config.ini rename to modules/install-database-mysql/config.ini diff --git a/modules/http-install-mysql.sh b/modules/install-database-mysql/init.sh similarity index 96% rename from modules/http-install-mysql.sh rename to modules/install-database-mysql/init.sh index 2cb6ac8..6fe3108 100755 --- a/modules/http-install-mysql.sh +++ b/modules/install-database-mysql/init.sh @@ -71,6 +71,3 @@ cp -r $MODULEPATH/$MODULE/mysql/* /etc/mysql/ # Start Daemon subheader "Starting Daemon..." daemon_manage mysql start - -# Package List Clean Question -package_clean_question diff --git a/modules/http-install-mysql/mysql/conf.d/disable_innodb.cnf b/modules/install-database-mysql/mysql/conf.d/disable_innodb.cnf similarity index 100% rename from modules/http-install-mysql/mysql/conf.d/disable_innodb.cnf rename to modules/install-database-mysql/mysql/conf.d/disable_innodb.cnf diff --git a/modules/http-install-mysql/mysql/conf.d/minimal.cnf b/modules/install-database-mysql/mysql/conf.d/minimal.cnf similarity index 100% rename from modules/http-install-mysql/mysql/conf.d/minimal.cnf rename to modules/install-database-mysql/mysql/conf.d/minimal.cnf diff --git a/modules/http-install-mysql/mysql/my.cnf b/modules/install-database-mysql/mysql/my.cnf similarity index 100% rename from modules/http-install-mysql/mysql/my.cnf rename to modules/install-database-mysql/mysql/my.cnf diff --git a/modules/http-install-php/config.ini b/modules/install-database-postgresql/config.ini similarity index 100% rename from modules/http-install-php/config.ini rename to modules/install-database-postgresql/config.ini diff --git a/modules/install-dropbear/config.ini b/modules/install-database-postgresql/init.sh similarity index 100% rename from modules/install-dropbear/config.ini rename to modules/install-database-postgresql/init.sh diff --git a/modules/install-ssh/config.ini b/modules/install-database-sqlite/config.ini similarity index 100% rename from modules/install-ssh/config.ini rename to modules/install-database-sqlite/config.ini diff --git a/modules/install-database-sqlite/init.sh b/modules/install-database-sqlite/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-extra-packages.sh b/modules/install-extra-packages/init.sh similarity index 90% rename from modules/install-extra-packages.sh rename to modules/install-extra-packages/init.sh index 8374c74..aa30364 100755 --- a/modules/install-extra-packages.sh +++ b/modules/install-extra-packages/init.sh @@ -24,6 +24,3 @@ done # Unset Array unset PACKAGELIST - -# Package List Clean Question -package_clean_question diff --git a/modules/install-extra-repositories.sh b/modules/install-extra-repositories/init.sh similarity index 93% rename from modules/install-extra-repositories.sh rename to modules/install-extra-repositories/init.sh index 0660e91..41a457b 100755 --- a/modules/install-extra-repositories.sh +++ b/modules/install-extra-repositories/init.sh @@ -37,6 +37,3 @@ unset REPOLIST # Update Package Lists package_update - -# Package List Clean Question -package_clean_question diff --git a/modules/install-framework-django/config.ini b/modules/install-framework-django/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-framework-django/init.sh b/modules/install-framework-django/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-framework-node/config.ini b/modules/install-framework-node/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-framework-node/init.sh b/modules/install-framework-node/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-framework-php/config.ini b/modules/install-framework-php/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/http-install-php.sh b/modules/install-framework-php/init.sh similarity index 91% rename from modules/http-install-php.sh rename to modules/install-framework-php/init.sh index 5d84d73..b404ae2 100755 --- a/modules/http-install-php.sh +++ b/modules/install-framework-php/init.sh @@ -25,6 +25,3 @@ cp -r $MODULEPATH/$MODULE/php5/* /etc/php5/ # Restart Daemon subheader "Restarting Daemon..." daemon_manage php5-fpm restart - -# Package List Clean Question -package_clean_question diff --git a/modules/http-install-php/php5/fpm/php-fpm.conf b/modules/install-framework-php/php5/fpm/php-fpm.conf similarity index 100% rename from modules/http-install-php/php5/fpm/php-fpm.conf rename to modules/install-framework-php/php5/fpm/php-fpm.conf diff --git a/modules/http-install-php/php5/fpm/pool.d/www-data.conf b/modules/install-framework-php/php5/fpm/pool.d/www-data.conf similarity index 100% rename from modules/http-install-php/php5/fpm/pool.d/www-data.conf rename to modules/install-framework-php/php5/fpm/pool.d/www-data.conf diff --git a/modules/http-install-php-extra/config.ini b/modules/install-framework-php/temp/config.ini similarity index 100% rename from modules/http-install-php-extra/config.ini rename to modules/install-framework-php/temp/config.ini diff --git a/modules/http-install-php-extra.sh b/modules/install-framework-php/temp/http-install-php-extra.sh similarity index 95% rename from modules/http-install-php-extra.sh rename to modules/install-framework-php/temp/http-install-php-extra.sh index 0f759a4..e76426a 100755 --- a/modules/http-install-php-extra.sh +++ b/modules/install-framework-php/temp/http-install-php-extra.sh @@ -47,6 +47,3 @@ if check_package "nginx"; then subheader "Restarting Daemon (nginx)..." daemon_manage nginx restart fi - -# Package List Clean Question -package_clean_question diff --git a/modules/install-framework-ruby/config.ini b/modules/install-framework-ruby/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-framework-ruby/init.sh b/modules/install-framework-ruby/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-http-nginx/config.ini b/modules/install-http-nginx/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/http-install-nginx.sh b/modules/install-http-nginx/init.sh similarity index 96% rename from modules/http-install-nginx.sh rename to modules/install-http-nginx/init.sh index b83b48e..cf88ad2 100755 --- a/modules/http-install-nginx.sh +++ b/modules/install-http-nginx/init.sh @@ -54,6 +54,3 @@ fi # Restart Daemon subheader "Restarting Daemon..." daemon_manage nginx restart - -# Package List Clean Question -package_clean_question diff --git a/modules/http-install-nginx/nginx/conf.d/cache.conf b/modules/install-http-nginx/nginx/conf.d/cache.conf similarity index 100% rename from modules/http-install-nginx/nginx/conf.d/cache.conf rename to modules/install-http-nginx/nginx/conf.d/cache.conf diff --git a/modules/http-install-nginx/nginx/conf.d/deny.conf b/modules/install-http-nginx/nginx/conf.d/deny.conf similarity index 100% rename from modules/http-install-nginx/nginx/conf.d/deny.conf rename to modules/install-http-nginx/nginx/conf.d/deny.conf diff --git a/modules/http-install-nginx/nginx/fastcgi_params b/modules/install-http-nginx/nginx/fastcgi_params similarity index 100% rename from modules/http-install-nginx/nginx/fastcgi_params rename to modules/install-http-nginx/nginx/fastcgi_params diff --git a/modules/http-install-nginx/nginx/hosts.d/default-ssl.conf b/modules/install-http-nginx/nginx/hosts.d/default-ssl.conf similarity index 100% rename from modules/http-install-nginx/nginx/hosts.d/default-ssl.conf rename to modules/install-http-nginx/nginx/hosts.d/default-ssl.conf diff --git a/modules/http-install-nginx/nginx/hosts.d/default.conf b/modules/install-http-nginx/nginx/hosts.d/default.conf similarity index 100% rename from modules/http-install-nginx/nginx/hosts.d/default.conf rename to modules/install-http-nginx/nginx/hosts.d/default.conf diff --git a/modules/http-install-nginx/nginx/nginx.conf b/modules/install-http-nginx/nginx/nginx.conf similarity index 100% rename from modules/http-install-nginx/nginx/nginx.conf rename to modules/install-http-nginx/nginx/nginx.conf diff --git a/modules/http-install-nginx/nginx/nginx.d/cache.conf b/modules/install-http-nginx/nginx/nginx.d/cache.conf similarity index 100% rename from modules/http-install-nginx/nginx/nginx.d/cache.conf rename to modules/install-http-nginx/nginx/nginx.d/cache.conf diff --git a/modules/http-install-nginx/nginx/nginx.d/cache_ssl.conf b/modules/install-http-nginx/nginx/nginx.d/cache_ssl.conf similarity index 100% rename from modules/http-install-nginx/nginx/nginx.d/cache_ssl.conf rename to modules/install-http-nginx/nginx/nginx.d/cache_ssl.conf diff --git a/modules/http-install-nginx/nginx/nginx.d/gzip.conf b/modules/install-http-nginx/nginx/nginx.d/gzip.conf similarity index 100% rename from modules/http-install-nginx/nginx/nginx.d/gzip.conf rename to modules/install-http-nginx/nginx/nginx.d/gzip.conf diff --git a/modules/http-install-nginx/nginx/php.d/www-data.conf b/modules/install-http-nginx/nginx/php.d/www-data.conf similarity index 100% rename from modules/http-install-nginx/nginx/php.d/www-data.conf rename to modules/install-http-nginx/nginx/php.d/www-data.conf diff --git a/modules/install-mail-exim/config.ini b/modules/install-mail-exim/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/http-install-exim.sh b/modules/install-mail-exim/init.sh similarity index 90% rename from modules/http-install-exim.sh rename to modules/install-mail-exim/init.sh index e5a0db7..f77f114 100755 --- a/modules/http-install-exim.sh +++ b/modules/install-mail-exim/init.sh @@ -18,6 +18,3 @@ sed -i "s/dc_eximconfig_configtype='local'/dc_eximconfig_configtype='internet'/" # Restart Daemon subheader "Restarting Daemon..." daemon_manage exim4 restart - -# Package List Clean Question -package_clean_question diff --git a/modules/install-security-fail2ban/config.ini b/modules/install-security-fail2ban/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-fail2ban/init.sh b/modules/install-security-fail2ban/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-logwatch/config.ini b/modules/install-security-logwatch/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-logwatch/init.sh b/modules/install-security-logwatch/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-sudo/config.ini b/modules/install-security-sudo/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-sudo/init.sh b/modules/install-security-sudo/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-unattended-upgrades/config.ini b/modules/install-security-unattended-upgrades/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-security-unattended-upgrades/init.sh b/modules/install-security-unattended-upgrades/init.sh new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-terminal-dropbear/config.ini b/modules/install-terminal-dropbear/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-dropbear/default/dropbear b/modules/install-terminal-dropbear/default/dropbear similarity index 100% rename from modules/install-dropbear/default/dropbear rename to modules/install-terminal-dropbear/default/dropbear diff --git a/modules/install-dropbear.sh b/modules/install-terminal-dropbear/init.sh similarity index 89% rename from modules/install-dropbear.sh rename to modules/install-terminal-dropbear/init.sh index 9eb5be2..fe7ae4d 100755 --- a/modules/install-dropbear.sh +++ b/modules/install-terminal-dropbear/init.sh @@ -14,7 +14,7 @@ if ! (question --default yes "Do you still want to run this module? (Y/n)" || [ fi # Set Module -MODULE=install-dropbear +MODULE=install-terminal-dropbear # Install Package subheader "Installing Package..." @@ -26,7 +26,7 @@ cp -r $MODULEPATH/$MODULE/default/* /etc/default/ # Install OpenSSH SFTP Support subheader "Installing OpenSSH SFTP Support..." -source $MODULEPATH/install-ssh.sh +source $MODULEPATH/install-terminal-ssh/init.sh # Remove OpenSSH Daemon subheader "Removing OpenSSH Daemon..." @@ -36,6 +36,3 @@ daemon_remove ssh # Restart Daemon subheader "Restarting Daemon..." daemon_manage dropbear restart - -# Package List Clean Question -package_clean_question diff --git a/modules/install-terminal-ssh/config.ini b/modules/install-terminal-ssh/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/install-ssh.sh b/modules/install-terminal-ssh/init.sh similarity index 88% rename from modules/install-ssh.sh rename to modules/install-terminal-ssh/init.sh index a096147..7e53738 100755 --- a/modules/install-ssh.sh +++ b/modules/install-terminal-ssh/init.sh @@ -5,7 +5,7 @@ package_update_question # Module Warning -if [ $MODULE != "install-dropbear" ]; then +if [ $MODULE != "install-terminal-dropbear" ]; then warning "This package will install the OpenSSH Server. If you want the Dropbear SSH server (they are functionally identical) cancel and run its module instead." if ! (question --default yes "Do you still want to run this module? (Y/n)" || [ $UNATTENDED = 1 ]); then # Skipped Message @@ -29,6 +29,3 @@ cp -r $MODULEPATH/$MODULE/ssh/* /etc/ssh/ # Restart Daemon subheader "Restarting Daemon..." daemon_manage ssh restart - -# Package List Clean Question -package_clean_question diff --git a/modules/install-ssh/ssh/ssh_config b/modules/install-terminal-ssh/ssh/ssh_config similarity index 100% rename from modules/install-ssh/ssh/ssh_config rename to modules/install-terminal-ssh/ssh/ssh_config diff --git a/modules/install-ssh/ssh/sshd_config b/modules/install-terminal-ssh/ssh/sshd_config similarity index 100% rename from modules/install-ssh/ssh/sshd_config rename to modules/install-terminal-ssh/ssh/sshd_config diff --git a/modules/manage-add-host.sh b/modules/manage-add-host/init.sh similarity index 100% rename from modules/manage-add-host.sh rename to modules/manage-add-host/init.sh diff --git a/modules/manage-add-user.sh b/modules/manage-add-user/init.sh similarity index 100% rename from modules/manage-add-user.sh rename to modules/manage-add-user/init.sh diff --git a/modules/manage-manage-host.sh b/modules/manage-manage-host/init.sh similarity index 100% rename from modules/manage-manage-host.sh rename to modules/manage-manage-host/init.sh diff --git a/modules/manage-manage-user.sh b/modules/manage-manage-user/init.sh similarity index 100% rename from modules/manage-manage-user.sh rename to modules/manage-manage-user/init.sh diff --git a/modules/manage-remove-host.sh b/modules/manage-remove-host/init.sh similarity index 100% rename from modules/manage-remove-host.sh rename to modules/manage-remove-host/init.sh diff --git a/modules/manage-remove-user/config.ini b/modules/manage-remove-user/config.ini new file mode 100644 index 0000000..e69de29 diff --git a/modules/manage-remove-user/init.sh b/modules/manage-remove-user/init.sh new file mode 100644 index 0000000..e69de29