fixing mysql to run on fedora

README.md

@@ -16,6 +16,13 @@ Instruction for spin VM and destroy:
 - When you ssh into machine specify the name of the machine [ubuntu|fedora|stage]'
 - When you destroy -f machine [ubuntu|fedora|stage]
 
+#Choosing OS
+
+- For fedora OS run 'vagrant up fedora'
+- For ubuntu OS run 'vagrant up ubuntu'
+- When you ssh into machine specify the name of the machine [fedora OR ubuntu OR stage]'
+- When you destroy -f machine [fedora OR ubuntu OR stage]
+
 # Our best practices:
 
 - Ask questions in the Slack group.
@@ -33,7 +40,7 @@ Instruction for spin VM and destroy:
 - Name: tiger + File format: pem
 - Move the file from Downloads to ~/.ssh
 - Windows users please address the additional steps before you countine
-- run 'vagrant up aws'
+- run 'vagrant up stage'
 
 # Additional steps for Windows users
 

scripts/bootstrap.sh

@@ -1,43 +1,46 @@
 #!/usr/bin/env bash
 os=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
-echo $os
+
+set_mysql () {
+    systemctl enable $1
+    systemctl start $1
+}
+
 if [ $os == '"Ubuntu"' ] 
 then
-    echo "im ubuntu"
     apt-get update
     # !----------! Setting MySQL root user password root/root !----------!
     debconf-set-selections <<< 'mysql-server mysql-server/root_password password LoginPass@@11223344'
     debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password LoginPass@@11223344'
     # !----------! install python and mysql !----------!
     apt-get -y install python3-pip mysql-server mysql-client
-
+    set_mysql "mysql"
 
 
 else
-    echo "im fedora"
     cp /vagrant/mysql-community.repo /etc/yum.repos.d/
     dnf -y update
     dnf -y install python3-pip mysql-community-server
-
+    set_mysql "mysqld.service"
 
     old_pw=$(grep 'temporary password' /var/log/mysqld.log | awk '{print $NF}')
     new_pw='LoginPass@@11223344'
     mysqladmin -u root -p"$old_pw" password "$new_pw"
+
 
 fi
 pip3 install -r /vagrant/requirements.txt
-    systemctl enable mysql
-    systemctl start mysql
+
     new_pw='LoginPass@@11223344'
     mysql -u root -p"$new_pw" <<MYSQL_SCRIPT
     CREATE DATABASE tiger;
     USE tiger;
-    CREATE TABLE users(username VARCHAR(20), password VARCHAR(100) NOT NULL, create_date TIMESTAMP NOT NULL, PRIMARY KEY(username));
-    CREATE TABLE messages(username VARCHAR(20),create_date TIMESTAMP NOT NULL,content VARCHAR(100) NOT NULL,FOREIGN KEY(username) REFERENCES users(username));
-    SHOW TABLES;
+    create table users(username VARCHAR(25) NOT NULL, password VARCHAR(100) NOT NULL, create_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY(username));
+    create table messages(message_id int NOT NULL AUTO_INCREMENT, username VARCHAR(25) NOT NULL, content text,
+    create_date TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, primary key(message_id), foreign key(username) references users(username));
     DESCRIBE users;
     DESCRIBE messages;
 MYSQL_SCRIPT
 
     chmod 755 /vagrant/app.py
-    nohup python3 /vagrant/app.py > /dev/null 2>&1 &
+    nohup python3 /vagrant/app.py > /dev/null 2>&1 &