-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove root check in tests, include test suite script
- Loading branch information
1 parent
ecf0841
commit 7ebf617
Showing
3 changed files
with
37 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
#!/bin/bash | ||
# | ||
# Fully automated LAMP installation and configuration using Trusted localhost | ||
# Fully automated LAMP installation and configuration using Trusted localhost | ||
# SSL Certificates | ||
# | ||
# Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me) | ||
# Author : Justin Hartman <[email protected]> (https://justin.hartman.me) | ||
# | ||
# Copyright: Copyright (C) 2018 Justin Hartman (https://justinhartman.co) | ||
# Author : Justin Hartman <[email protected]> (https://justinhartman.co) | ||
# License : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0 | ||
# Version : 1.1.0 | ||
# Link : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL | ||
# Link : https://justin.hartman.me | ||
# Link : https://github.com/justinhartman/lamp-ssl | ||
# Link : https://justinhartman.co | ||
# Since : 0.5.0 | ||
# | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU Affero General Public License as | ||
# published by the Free Software Foundation, either version 3 of the | ||
|
@@ -23,7 +23,7 @@ | |
# | ||
# You should have received a copy of the GNU Affero General Public License | ||
# along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
# | ||
# | ||
|
||
####################################### | ||
# Includes the colour palette and | ||
|
@@ -37,7 +37,7 @@ | |
####################################### | ||
global_includes () | ||
{ | ||
source scripts/globals.sh | ||
source ./test_suite.sh | ||
source scripts/colour_palette.sh | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,15 +3,15 @@ | |
# Add new domains to your setup. This creates the website folder, link to the | ||
# /etc/hosts file, creates a SSL certificate and sets up a git project for you | ||
# to begin using. | ||
# | ||
# Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me) | ||
# Author : Justin Hartman <[email protected]> (https://justin.hartman.me) | ||
# | ||
# Copyright: Copyright (C) 2018 Justin Hartman (https://justinhartman.co) | ||
# Author : Justin Hartman <[email protected]> (https://justinhartman.co) | ||
# License : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0 | ||
# Version : 1.1.0 | ||
# Link : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL | ||
# Link : https://justin.hartman.me | ||
# Link : https://github.com/justinhartman/lamp-ssl | ||
# Link : https://justinhartman.co | ||
# Since : 0.5.0 | ||
# | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU Affero General Public License as | ||
# published by the Free Software Foundation, either version 3 of the | ||
|
@@ -24,7 +24,7 @@ | |
# | ||
# You should have received a copy of the GNU Affero General Public License | ||
# along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
# | ||
# | ||
|
||
####################################### | ||
# Includes the colour palette and | ||
|
@@ -38,7 +38,7 @@ | |
####################################### | ||
global_includes () | ||
{ | ||
source scripts/globals.sh | ||
source ./test_suite.sh | ||
source scripts/colour_palette.sh | ||
} | ||
|
||
|
@@ -75,14 +75,14 @@ main_application () | |
|
||
global_includes # Includes global variables and file paths. | ||
|
||
if ! [ "$(id -u)" = 0 ]; then | ||
printf "${RED}%s\\n" "$TOP" | ||
printf "* %-76s %s\\n" "This needs to be run as root. Please run it again using 'sudo' by executing" "*" | ||
printf "* %-76s %s\\n" "the following command: $ sudo ./add_domain" "*" | ||
printf "%s${NOC}\\n\\n" "$BOTTOM" | ||
|
||
exit 1 | ||
fi | ||
#if ! [ "$(id -u)" = 0 ]; then | ||
# printf "${RED}%s\\n" "$TOP" | ||
# printf "* %-76s %s\\n" "This needs to be run as root. Please run it again using 'sudo' by executing" "*" | ||
# printf "* %-76s %s\\n" "the following command: $ sudo ./add_domain" "*" | ||
# printf "%s${NOC}\\n\\n" "$BOTTOM" | ||
# | ||
# exit 1 | ||
#fi | ||
|
||
main_application # Runs the main install | ||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,11 +2,11 @@ | |
# | ||
# Upgrade all the software. | ||
# | ||
# Copyright: Copyright 2018-2020 Justin Hartman (https://hartman.me) | ||
# Author : Justin Hartman <[email protected]> (https://hartman.me) | ||
# Copyright: Copyright 2018-2020 Justin Hartman (https://justinhartman.co) | ||
# Author : Justin Hartman <[email protected]> (https://justinhartman.co) | ||
# License : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0 | ||
# Version : 1.2.2 | ||
# Link : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL | ||
# Link : https://github.com/justinhartman/lamp-ssl | ||
# Since : 1.1.0 | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
|
@@ -34,7 +34,7 @@ | |
# Variables | ||
####################################### | ||
global_includes() { | ||
source ./scripts/globals.sh | ||
source ./test_suite.sh | ||
source ./scripts/colour_palette.sh | ||
} | ||
|
||
|
@@ -58,14 +58,14 @@ main_application() { | |
|
||
global_includes # Includes global variables and file paths. | ||
|
||
if ! [ "$(id -u)" = 0 ]; then | ||
printf "${RED}%s\\n" "$TOP" | ||
printf '* %-76s %s\n' "This needs to be run as root. Please run it again using 'sudo' by executing" "*" | ||
printf '* %-76s %s\n' "the following command: $ sudo ./upgrade" "*" | ||
printf "%s${NOC}\\n\\n" "$BOTTOM" | ||
|
||
exit 1 | ||
fi | ||
#if ! [ "$(id -u)" = 0 ]; then | ||
# printf "${RED}%s\\n" "$TOP" | ||
# printf '* %-76s %s\n' "This needs to be run as root. Please run it again using 'sudo' by executing" "*" | ||
# printf '* %-76s %s\n' "the following command: $ sudo ./upgrade" "*" | ||
# printf "%s${NOC}\\n\\n" "$BOTTOM" | ||
# | ||
# exit 1 | ||
#fi | ||
|
||
####################################### | ||
# Runs the main upgrade. | ||
|