From 500a8b0e513e5470b0d9d67ee6aa723d4c20cb1b Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Fri, 13 Aug 2021 12:07:22 +0200 Subject: [PATCH 1/9] Newest Modules --- GermanAirlinesVA-Fleet | 2 +- GermanAirlinesVA-Routes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GermanAirlinesVA-Fleet b/GermanAirlinesVA-Fleet index 683c6f5..b5b7967 160000 --- a/GermanAirlinesVA-Fleet +++ b/GermanAirlinesVA-Fleet @@ -1 +1 @@ -Subproject commit 683c6f52ad69cfa5caef19a75c9438b5319a3294 +Subproject commit b5b7967eb7cccec3425a2ad596e1042684d9325a diff --git a/GermanAirlinesVA-Routes b/GermanAirlinesVA-Routes index 7722312..64280e3 160000 --- a/GermanAirlinesVA-Routes +++ b/GermanAirlinesVA-Routes @@ -1 +1 @@ -Subproject commit 772231231daa88241d9de8794b0ee3420b79c4a3 +Subproject commit 64280e348608883a082818dcde1d3dbc0e61c1cb From 1b9689c519f933811a4d63229e6807e021b2ddb8 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Fri, 13 Aug 2021 22:06:12 +0200 Subject: [PATCH 2/9] Newest Modules --- GermanAirlinesVA-React | 2 +- GermanAirlinesVA-Schooling | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GermanAirlinesVA-React b/GermanAirlinesVA-React index 2000c4e..88439ec 160000 --- a/GermanAirlinesVA-React +++ b/GermanAirlinesVA-React @@ -1 +1 @@ -Subproject commit 2000c4eb878f2c45a02f078460665328487bb784 +Subproject commit 88439ec273073015c459903e5b56d56cfc145a7f diff --git a/GermanAirlinesVA-Schooling b/GermanAirlinesVA-Schooling index aa073a5..77799b2 160000 --- a/GermanAirlinesVA-Schooling +++ b/GermanAirlinesVA-Schooling @@ -1 +1 @@ -Subproject commit aa073a50290e7ba4b241274605c62736ef8a9f49 +Subproject commit 77799b26cc37bebbdc1a5b1462c2d1decec6d35f From 3c7d3ae6050d7f8fb9e2cc1ef6b8b5c1ac7930c1 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 12:59:15 +0200 Subject: [PATCH 3/9] New DB --- installer/october_db_setup.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/installer/october_db_setup.sql b/installer/october_db_setup.sql index c7b5c12..e86434d 100644 --- a/installer/october_db_setup.sql +++ b/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'; From 5ced1b668d1d9c77e3f5d0078b9dd0096bf07e0b Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 13:02:15 +0200 Subject: [PATCH 4/9] New Module --- .gitmodules | 3 +++ GermanAirlinesVA-Social | 1 + 2 files changed, 4 insertions(+) create mode 160000 GermanAirlinesVA-Social diff --git a/.gitmodules b/.gitmodules index c440281..cc7cd05 100644 --- a/.gitmodules +++ b/.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 diff --git a/GermanAirlinesVA-Social b/GermanAirlinesVA-Social new file mode 160000 index 0000000..3a75eeb --- /dev/null +++ b/GermanAirlinesVA-Social @@ -0,0 +1 @@ +Subproject commit 3a75eeb51f17121acf2d5215ff9ebb6a3952d4d7 From 81161a4db72afaa9246e8c7e12320efb268d4743 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 15:02:14 +0200 Subject: [PATCH 5/9] Install Script yarn --- installer/ga_postinstall_setup.sh | 42 +++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/installer/ga_postinstall_setup.sh b/installer/ga_postinstall_setup.sh index f0c7a48..28c734c 100755 --- a/installer/ga_postinstall_setup.sh +++ b/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 From 72e54f1119df14addf723bdb343efd5e5347ddd2 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 15:19:35 +0200 Subject: [PATCH 6/9] CD --- installer/ga_postinstall_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/ga_postinstall_setup.sh b/installer/ga_postinstall_setup.sh index 28c734c..decc650 100755 --- a/installer/ga_postinstall_setup.sh +++ b/installer/ga_postinstall_setup.sh @@ -18,7 +18,7 @@ if [ $? != 0 ]; then fi whiptail --msgbox "Installing packages" 7 23 -cd plugins/germanairlinesva/fleet +cd ../plugins/germanairlinesva/fleet yarn install if [ $? != 0 ]; then echo -e "\033[0;31mCould not install fleet packages" From 49ee51f1148059c51da9a79fc633350929bd4581 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 15:25:34 +0200 Subject: [PATCH 7/9] Require --- composer.json | 5 +++-- installer/ga_install.sh | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8346702..511f121 100644 --- a/composer.json +++ b/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" } -} \ No newline at end of file +} diff --git a/installer/ga_install.sh b/installer/ga_install.sh index 4326068..1f67df5 100755 --- a/installer/ga_install.sh +++ b/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="{ From 0adb11a22559bacbc55ad9cf43427de75a6c4b31 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 22:39:54 +0200 Subject: [PATCH 8/9] Newest Modules --- GermanAirlinesVA-Fleet | 2 +- GermanAirlinesVA-GraphQL | 2 +- GermanAirlinesVA-Routes | 2 +- GermanAirlinesVA-Schooling | 2 +- GermanAirlinesVA-Social | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GermanAirlinesVA-Fleet b/GermanAirlinesVA-Fleet index b5b7967..dda6143 160000 --- a/GermanAirlinesVA-Fleet +++ b/GermanAirlinesVA-Fleet @@ -1 +1 @@ -Subproject commit b5b7967eb7cccec3425a2ad596e1042684d9325a +Subproject commit dda6143f8ae68f65813dcb70f14b4ac1bd736fb2 diff --git a/GermanAirlinesVA-GraphQL b/GermanAirlinesVA-GraphQL index a559813..9b153da 160000 --- a/GermanAirlinesVA-GraphQL +++ b/GermanAirlinesVA-GraphQL @@ -1 +1 @@ -Subproject commit a5598130db6a3c7a75d8efc0692a85dfab481a5d +Subproject commit 9b153dacd8470c26ffd5544ddde42dcdaffe3bc7 diff --git a/GermanAirlinesVA-Routes b/GermanAirlinesVA-Routes index 64280e3..c12b87c 160000 --- a/GermanAirlinesVA-Routes +++ b/GermanAirlinesVA-Routes @@ -1 +1 @@ -Subproject commit 64280e348608883a082818dcde1d3dbc0e61c1cb +Subproject commit c12b87c6181713c4fad91a0e2b44b0f738950d76 diff --git a/GermanAirlinesVA-Schooling b/GermanAirlinesVA-Schooling index 77799b2..5f232a6 160000 --- a/GermanAirlinesVA-Schooling +++ b/GermanAirlinesVA-Schooling @@ -1 +1 @@ -Subproject commit 77799b26cc37bebbdc1a5b1462c2d1decec6d35f +Subproject commit 5f232a645c4edfe3d2de3e0fcaa725f8dde67270 diff --git a/GermanAirlinesVA-Social b/GermanAirlinesVA-Social index 3a75eeb..c15ab5c 160000 --- a/GermanAirlinesVA-Social +++ b/GermanAirlinesVA-Social @@ -1 +1 @@ -Subproject commit 3a75eeb51f17121acf2d5215ff9ebb6a3952d4d7 +Subproject commit c15ab5c59cff9a5b86767702fd32382e2bc7348e From 4301013547d9760167110047948cfeed9ff9d0fa Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Tue, 14 Sep 2021 10:10:52 +0200 Subject: [PATCH 9/9] Latest --- GermanAirlinesVA-Schooling | 2 +- GermanAirlinesVA-Social | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GermanAirlinesVA-Schooling b/GermanAirlinesVA-Schooling index 5f232a6..f0a2ac1 160000 --- a/GermanAirlinesVA-Schooling +++ b/GermanAirlinesVA-Schooling @@ -1 +1 @@ -Subproject commit 5f232a645c4edfe3d2de3e0fcaa725f8dde67270 +Subproject commit f0a2ac15fb7c1920beadf020fd8134dd1bf99f54 diff --git a/GermanAirlinesVA-Social b/GermanAirlinesVA-Social index c15ab5c..c84adc3 160000 --- a/GermanAirlinesVA-Social +++ b/GermanAirlinesVA-Social @@ -1 +1 @@ -Subproject commit c15ab5c59cff9a5b86767702fd32382e2bc7348e +Subproject commit c84adc30b38906c1c6b57821e0b5ed80125a3a0a