Tweaking README format.

Author: betweenbrain

README.md

@@ -11,14 +11,14 @@ Getting started
 ----------------
 
 1. Before you do anything else, thoroughly review [build.sh](https://github.com/betweenbrain/ubuntu-web-server-build-script/blob/master/build.sh). You need to understand what it is doing.
-2. Then, fire up your VM or VPS with a fresh install of Ubuntu 10.04 on it, connect via SSH and become the Root user.
-3. Upload build.sh to your server -OR- create a new shell script via `$ nano build.sh` and copy/paste the contents of [build.sh](https://github.com/betweenbrain/ubuntu-web-server-build-script/blob/master/build.sh) into it.
+2. Then, fire up your VM or VPS with a fresh install of Ubuntu 10.04, connect via SSH and become the Root user.
+3. Upload [build.sh](https://github.com/betweenbrain/ubuntu-web-server-build-script/blob/master/build.sh) to your server -OR- create a new shell script via `$ nano build.sh` and copy/paste the contents of [build.sh](https://github.com/betweenbrain/ubuntu-web-server-build-script/blob/master/build.sh) into it.
 4. Make your script executable `$ chmod +x build.sh`
 5. Let 'er rip! `$ ./build.sh` and follow the on-screen prompts.
 
 When running this script, please keep an eye on things (they tend happen fast) and keep an eye out for errors. If you see any, please [create an issue report](https://github.com/betweenbrain/ubuntu-web-server-build-script/issues?sort=created&direction=desc&state=open).
 
-Need a VPS? Grab one at [Linode](http://www.linode.com/?r=e0368c8dce7aa292de419c36ae0078f64d6d4233). They rock!
+Need a VPS? Get one from [Linode](http://www.linode.com/?r=e0368c8dce7aa292de419c36ae0078f64d6d4233), they rock!
 
 The highlight real
 -----------------
@@ -29,13 +29,13 @@ This script does a bunch of things. The general run down is that it:
   - Two scripts are added so that IPTables rules are saved and re-loaded when reboting.
   - Installs and configures Apache2 (MPM Worker), MySQL, PHP5, suExec, fcgid, as well as creates and enables a new site under your admin user's account.
   - Installs and configures  mod_evasive, fail2ban, and mod_security. Your admin user's IP address is whitelisted from these security services and a mod_security filter is added to fail2ban. OWASP rules for mod_security v2.2.3 are fetched, configured, and a select set of rules are loaded.
-  NOTE: The OWASP rules are configured for DetectionOnly by default. You need to change that to On when you are comforatble with them.
-  ANOTHER NOTE: As Ubuntu 10.04 uses mod_security v2.5.11-1, a couple of workarounds for backwards compatability issues are implemented. Read the script and see for yourself ;)
+  NOTE: The OWASP rules are configured for DetectionOnly by default. You need to change that to On when you are comfortable with them.
+  ANOTHER NOTE: As Ubuntu 10.04 uses mod_security v2.5.11-1, a couple of workarounds for backwards compatibility issues are implemented. Read the script and see for yourself ;)
 
 What's Next?
 ------------
 There are many things to do next (like keep your server up to date!), here are a few ideas:
-  - Grab a copy of mysqltuner.pl and tweak your mysql install `wget http://mysqltuner.pl/mysqltuner.pl` (run with `perl mysqltuner.pl` and follow the recomendations. I.e. `sed -i "s/ssl-key=\/etc\/mysql\/server-key.pem/ssl-key=\/etc\/mysql\/server-key.pem\n\nskip-innodb\n/g" /etc/mysql/my.cnf`)
+  - Grab a copy of mysqltuner.pl and tweak your mysql install `wget http://mysqltuner.pl/mysqltuner.pl` (run with `perl mysqltuner.pl` and follow the recommendations. i.e. `sed -i "s/ssl-key=\/etc\/mysql\/server-key.pem/ssl-key=\/etc\/mysql\/server-key.pem\n\nskip-innodb\n/g" /etc/mysql/my.cnf`
   - Keep an eye on your logs and adjust mod_security / fail2ban accordingly
   - Keep things up to date `sudo aptitude safe-upgrade`
   - Add a new database, with user, with [add-db.sh](https://github.com/betweenbrain/ubuntu-web-server-build-script/admin-scripts/blob/master/add-db.sh)

admin-scripts/add-db.sh

@@ -14,10 +14,10 @@ read -p "Enter new username: " USER
 echo
 read -p -s "Enter password for this user: " PW
 echo
-echo "Creating database $DB and granting access to $USER with password $PW"
 #
 QUERY="CREATE DATABASE $DB;GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES ON $DB.* TO '$USER'@'localhost' IDENTIFIED BY '$PW';"
 mysql -u root -p$MYSQLPW -e "$QUERY"
 #
-echo "Done!"
+echo "Done creating database $DB and granting access to $USER with password $PW"
+#
 

admin-scripts/add-site.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
-echo "Enter new site domain"
-read DOMAIN
+# ================================================================== #
+# Shell script to add a new site (virtual host)
+# ================================================================== #
+# Copyright (c) 2012 Matt Thomas http://betweenbrain.com
+# This script is licensed under GNU GPL version 2.0 or above
+# ================================================================== #
+#
+read -p "Enter new site domain: " DOMAIN
 echo
-echo "Enter user under which new site will run under"
-read USER
+read -p "Enter user under which new site will run under: " USER
 echo
 echo "<VirtualHost *:80>
     DocumentRoot /home/$USER/public_html/$DOMAIN/www

admin-scripts/add-sudoer.sh

@@ -1,13 +1,19 @@
 #!/bin/bash
-
-echo "Enter new sudoer username"
-read SUDOER
-
+# ================================================================== #
+# Shell script to add a new sudoer
+# ================================================================== #
+# Copyright (c) 2012 Matt Thomas http://betweenbrain.com
+# This script is licensed under GNU GPL version 2.0 or above
+# ================================================================== #
+#
+read -p "Enter new sudoer username: " SUDOER
+#
 sudo cp /etc/sudoers /etc/sudoers.tmp
 sudo chmod 0640 /etc/sudoers.tmp
 echo "$SUDOER   ALL=(ALL) ALL" >> /etc/sudoers.tmp
 sudo chmod 0440 /etc/sudoers.tmp
 sudo mv /etc/sudoers.tmp /etc/sudoers
-
+#
 echo "$SUDOER is now a sudoer"
+#
 

admin-scripts/add-user.sh

@@ -1,8 +1,14 @@
 #!/bin/bash
-
-echo "Enter new user's username"
-read NEWUSER
-
+# ================================================================== #
+# Shell script to add a new sudoer
+# ================================================================== #
+# Copyright (c) 2012 Matt Thomas http://betweenbrain.com
+# This script is licensed under GNU GPL version 2.0 or above
+# ================================================================== #
+#
+read -p "Enter new user's username: " NEWUSER
+#
 useradd -s /bin/bash -m -d /home/$NEWUSER --user-group $NEWUSER
-passwd
+passwd $NEWUSER
+#