Merge branch 'master' of https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-OctoberPlugins

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "GermanAirlinesVA-Routes"]
 	path = GermanAirlinesVA-Routes
 	url = https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Routes.git
+[submodule "GermanAirlinesVA-Social"]
+	path = GermanAirlinesVA-Social
+	url = https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Social.git

GermanAirlinesVA-Fleet

@@ -1 +1 @@
-Subproject commit b5b7967eb7cccec3425a2ad596e1042684d9325a
+Subproject commit dda6143f8ae68f65813dcb70f14b4ac1bd736fb2

GermanAirlinesVA-GraphQL

@@ -1 +1 @@
-Subproject commit a5598130db6a3c7a75d8efc0692a85dfab481a5d
+Subproject commit 9b153dacd8470c26ffd5544ddde42dcdaffe3bc7

GermanAirlinesVA-React

@@ -1 +1 @@
-Subproject commit 2000c4eb878f2c45a02f078460665328487bb784
+Subproject commit 88439ec273073015c459903e5b56d56cfc145a7f

GermanAirlinesVA-Routes

@@ -1 +1 @@
-Subproject commit 64280e348608883a082818dcde1d3dbc0e61c1cb
+Subproject commit c12b87c6181713c4fad91a0e2b44b0f738950d76

GermanAirlinesVA-Schooling

@@ -1 +1 @@
-Subproject commit aa073a50290e7ba4b241274605c62736ef8a9f49
+Subproject commit f0a2ac15fb7c1920beadf020fd8134dd1bf99f54

GermanAirlinesVA-Social

@@ -0,0 +1 @@
+Subproject commit c84adc30b38906c1c6b57821e0b5ed80125a3a0a

composer.json

@@ -7,6 +7,7 @@
     "germanairlinesva/schooling": "dev-master",
     "germanairlinesva/fleet": "dev-master",
     "germanairlinesva/react": "dev-master",
-    "germanairlinesva/routes": "dev-master"
+    "germanairlinesva/routes": "dev-master",
+    "germanairlinesva/social": "dev-master"
   }
-}
+}

installer/ga_install.sh

@@ -24,6 +24,10 @@ repos="{
   \"ga.routes\": {
     \"type\": \"git\",
     \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Routes.git\"
+  },
+  \"ga.social\": {
+    \"type\": \"git\",
+    \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Social.git\"
   }
 }"
 require="{

installer/ga_postinstall_setup.sh

@@ -17,10 +17,48 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-cd ..
+whiptail --msgbox "Installing packages" 7 23
+cd ../plugins/germanairlinesva/fleet
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install fleet packages"
+  exit 1
+fi
+cd ../graphql
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install graphql packages"
+  exit 1
+fi
+cd ../react
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install react packages"
+  exit 1
+fi
+cd ../routes
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install routes packages"
+  exit 1
+fi
+cd ../schooling
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install schooling packages"
+  exit 1
+fi
+cd ../social
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install social packages"
+  exit 1
+fi
+
+cd /var/www/ga
 
 whiptail --msgbox "Setting ownership" 7 21
-chown www-data -R .
+chown www-data:www-data -R .
 if [ $? != 0 ]; then
   echo -e "\033[0;31mCould not set ownership to www-data"
   exit 1

installer/october_db_setup.sql

@@ -3,6 +3,7 @@ create database germanairlinesva_fleet;
 create database germanairlinesva_graphql;
 create database germanairlinesva_routes;
 create database germanairlinesva_schooling;
+create database germanairlinesva_social;
 
 create user 'october'@'localhost' identified by '1582';