some more fixes

enoch85 · enoch85 · commit 3d78831dab97 · 2016-03-19T17:57:20.000+01:00
diff --git a/index.php b/index.php
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head><title>ownCloud - Tech and Me</title>
+<head><title>Wordpress - Tech and Me</title>
 <style>
 body {
-	background-color: #1d2d44;
+	background-image: url("https://www.techandme.se/wp-content/uploads/2015/12/bbbackground-1200-1024x683.jpg");
 	font-weight: 300;
 	font-size: 1em;
 	line-height: 1.6em;
@@ -14,21 +14,13 @@
 	margin-right: auto;
 	align: center;
 	text-align: center;
-	background: #1d2d44; /* Old browsers */
-	background: -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
-	background: -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
-	background: linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
 }
 div.logotext   {
 	width: 50%;
     	margin: 0 auto;
 }
 div.logo   {
-        background-image: url('/owncloud/core/img/logo-icon.svg');
+        background-image: url('https://www.techandme.se/wp-content/uploads/2015/01/WordPress-Logo-540x348.png');
         background-repeat: no-repeat; top center;
         width: 50%;
 	height: 25%;
@@ -78,44 +70,44 @@
 <div class="logo">
 </div>
 <div class="logotext">
-<h2>ownCloud VM - <a href="https://www.techandme.se/pre-configured-owncloud-installaton/" target="_blank">Tech and Me</a></h2>
+<h2>ownCloud VM - <a href="https://www.techandme.se/pre-configured-wordpress-installaton/" target="_blank">Tech and Me</a></h2>
 </div>
 <br>
 <div class="information">
-<p>Thank you for downloading the pre-configured ownCloud VM! If you see this page, you have successfully mounted the  ownCloud VM on the computer that will act as host for ownCloud.</p>
+<p>Thank you for downloading the pre-configured Wordpress VM! If you see this page, you have successfully mounted the  Wordpress VM on the computer that will act as host for Wordpress.</p>
 <p>To complete the installation, please run the setup script. You can find login details in the middle of this page.
-<p>Don't hesitate to ask if you have any questions. My email is: <a href="mailto:daniel@techandme.se?Subject=Before%20login%20-%20ownCloud%20VM" target="_top">daniel@techandme.se</a> You can also check the <a href="https://www.techandme.se/complete-install-instructions-owncloud/" target="_blank">complete install instructions</a>.</p>
+<p>Don't hesitate to ask if you have any questions. My email is: <a href="mailto:daniel@techandme.se?Subject=Before%20login%20-%20Wordpress%20VM" target="_top">daniel@techandme.se</a> You can also check the <a href="https://www.techandme.se/complete-install-instructions-wordpress/" target="_blank">complete install instructions</a>.</p>
 <p>Please <a href="https://www.techandme.se/thank_you">donate</a> if you like it. All the donations will go to server costs and developing, making this VM even better.</p>
 
 </div>
 
-<h2><a href="https://www.techandme.se/user-and-password/" target="_blank">Login</a> to ownCloud</h2>
+<h2><a href="https://www.techandme.se/user-pass/" target="_blank">Login</a> to Wordpress</h2>
 
 <div class="information">
 <p>Default User:</p>
-<h3>ocadmin</h3>
+<h3>wordpress</h3>
 <p>Default Password:</p>
-<h3>owncloud</h3>
-<p>Note: The setup script will ask you to change the default password to your own. It's also recomended to change the default user. Do this by adding another admin user, log out from ocadmin, and login with your new user, then delete ocadmin.</p>
+<h3>wordpress</h3>
+<p>Note: The setup script will ask you to change the default password to your own. It's also recomended to change the default user. Do this by adding another admin user. Don't forget to delete the old user "change_wordpress_user#" after you created you new admin account.</p>
 <br>
 <center>
 <h3> How to mount the VM and and login:</h3>
 </center>
-<p>Before you can use ownCloud you have to run the setup script to complete the installation. This is easily done by just typing 'owncloud' when you log in to the terminal for the first time.</p>
-<p>The full path to the setup script is: /var/scripts/owncloud-startup-script.sh. When the script is finnished it will be deleted, as it's only used the first time you boot the machine.</p>
+<p>Before you can use Wordpress you have to run the setup script to complete the installation. This is easily done by just typing 'wordpress' when you log in to the terminal for the first time.</p>
+<p>The full path to the setup script is: /var/scripts/wordpress-startup-script.sh. When the script is finished it will be deleted, as it's only used the first time you boot the machine.</p>
 <center> 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/jhbkTQ9yA-4" frameborder="0" allowfullscreen></iframe>
 </center>
 </div>
 
-<h2>Access ownCloud</h2>
+<h2>Access Wordpress</h2>
 
 <div class="information">
 <p>Use one of the following addresses, HTTPS is preffered:
 <h3>
 <ul>
- <li><a href="http://<?=$_SERVER['SERVER_NAME'];?>/owncloud"        >http://<?=$_SERVER['SERVER_NAME'];?></a> (HTTP)
- <li><a href="https://<?=$_SERVER['SERVER_NAME'];?>/owncloud"             >https://<?=$_SERVER['SERVER_NAME'];?></a> (HTTPS)
+ <li><a href="http://<?=$_SERVER['SERVER_NAME'];?>/wordpress"        >http://<?=$_SERVER['SERVER_NAME'];?></a> (HTTP)
+ <li><a href="https://<?=$_SERVER['SERVER_NAME'];?>/wordpress"             >https://<?=$_SERVER['SERVER_NAME'];?></a> (HTTPS)
  <p>
  </ul>
 </h3>
diff --git a/ip.sh b/ip.sh
@@ -3,10 +3,10 @@
 IFCONFIG="/sbin/ifconfig"
 IP="/sbin/ip"
 INTERFACES="/etc/network/interfaces"
-IFACE=$($IFCONFIG | grep HWaddr | cut -d " " -f 1)
 
+IFACE=$($IFCONFIG | grep HWaddr | cut -d " " -f 1)
 ADDRESS=$($IFCONFIG | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
-NETMASK=$($IFCONFIG | grep -w inet |grep -v 127.0.0.1| awk '{print $4}' | cut -d ":" -f 2
+NETMASK=$($IFCONFIG | grep -w inet |grep -v 127.0.0.1| awk '{print $4}' | cut -d ":" -f 2)
 GATEWAY=$($IP route | awk '/\<default\>/ {print $3; exit}')
 
 cat <<-IPCONFIG > "$INTERFACES"
diff --git a/wordpress-startup-script.sh b/wordpress-startup-script.sh
@@ -5,7 +5,7 @@
 WWW_ROOT=/var/www/html
 WPATH=$WWW_ROOT/wordpress
 SCRIPTS=/var/scripts
-PW_FILE=/var/mysql_password.txt # Keep in sync with owncloud_install_production.sh
+PW_FILE=/var/mysql_password.txt # Keep in sync with wordpress_install_production.sh
 IFCONFIG="/sbin/ifconfig"
 IFACE=$($IFCONFIG | grep HWaddr | cut -d " " -f 1)
 ADDRESS=$($IFCONFIG | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
@@ -18,7 +18,7 @@ LETS_ENC="https://raw.githubusercontent.com/enoch85/ownCloud-VM/master/lets-encr
 	# Check if root
 	if [ "$(whoami)" != "root" ]; then
         echo
-        echo -e "\e[31mSorry, you are not root.\n\e[0mYou must type: \e[36msudo \e[0mbash $SCRIPTS/owncloud-startup-script.sh"
+        echo -e "\e[31mSorry, you are not root.\n\e[0mYou must type: \e[36msudo \e[0mbash $SCRIPTS/wordpress-startup-script.sh"
         echo
         exit 1
 fi
@@ -90,7 +90,7 @@ fi
                 else
         wget -q $GITHUB_REPO/index.php -P $SCRIPTS
 fi
-        mv $SCRIPTS/index.php $WWW_ROOT/index.php && rm -f $WWW_ROOT/html/index.html
+        mv $SCRIPTS/index.php $WWW_ROOT/index.php && rm -f $WWW_ROOT/index.html
         chmod 750 $WWW_ROOT/index.php && chown www-data:www-data $WWW_ROOT/index.php
 
         # Change 000-default to $WEB_ROOT
@@ -100,7 +100,7 @@ fi
 chmod +x -R $SCRIPTS
 chown root:root -R $SCRIPTS
 
-# Allow ocadmin to run figlet script
+# Allow wordpress to run figlet script
 chown wordpress:wordpress $SCRIPTS/techandme.sh
 
 clear
@@ -211,7 +211,7 @@ clear
 # Change password
 echo -e "\e[0m"
 echo "For better security, change the Linux password for user [wordpress]"
-echo "The current password is [owncloud]"
+echo "The current password is [wordpress]"
 echo -e "\e[32m"
 read -p "Press any key to change password for Linux... " -n1 -s
 echo -e "\e[0m"
@@ -232,7 +232,7 @@ function ask_yes_or_no() {
         *)     echo "no" ;;
     esac
 }
-if [[ "yes" == $(ask_yes_or_no "Last but not least, do you want to install a real SSL cert (from Let's Encrypt) on this machine? The script is still Alpha, feel free to contribute!") ]]
+if [[ "yes" == $(ask_yes_or_no "Last but not least, do you want to install a real SSL cert from Let's Encrypt on this machine? (The script is still Alpha, feel free to contribute!)") ]]
 then
 	bash $SCRIPTS/activate-ssl.sh
 else
diff --git a/wordpress_install.sh b/wordpress_install.sh
@@ -328,7 +328,7 @@ fi
         wget -q $GITHUB_REPO/wordpress-startup-script.sh -P $SCRIPTS
 fi
 
-# Welcome message after login (change in /home/ocadmin/.profile
+# Welcome message after login (change in /home/wordpress/.profile
         if [ -f $SCRIPTS/instruction.sh ];
                 then
                 echo "instruction.sh exists"
@@ -354,7 +354,7 @@ else
 	rm $SCRIPTS/change-root-profile.sh
 	sleep 2
 fi
-# Change ocadmin profile
+# Change wordpress profile
         	bash $SCRIPTS/change-wordpress-profile.sh
 if [[ $? > 0 ]]
 then
diff --git a/wordpress_update.sh b/wordpress_update.sh
@@ -22,7 +22,7 @@ wp db optimize --allow-root
 echo
 echo "This is the current version installed:"
 echo
-wp wp core version --extra --allow-root
+wp core version --extra --allow-root
 sleep 5
 
 # Set secure permissions
@@ -32,9 +32,9 @@ then
         echo "Script exists"
 else
         mkdir -p /var/scripts
-        wget https://raw.githubusercontent.com/enoch85/wordpress-vm/master/wp_permissions.sh -P /var/scripts/
+        wget -q https://raw.githubusercontent.com/enoch85/wordpress-vm/master/wp-permissions.sh -P /var/scripts/
 fi
-sudo bash /var/scripts/wp_permissions.sh
+sudo bash /var/scripts/wp-permissions.sh
 
 # Cleanup un-used packages
 sudo apt-get autoremove -y
