diff --git a/setup.sh b/setup.sh index 06adb57..cec8559 100644 --- a/setup.sh +++ b/setup.sh @@ -50,8 +50,9 @@ mysql -e 'create database oms;' -u ${DB_USER} -p${DB_PASSWORD} #echo "USE mysql;\nUPDATE user SET password=PASSWORD('123456') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root cd ${ROOT_PATH} +touch private.php -curl --connect-timeout 600 --max-time 601 -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' -A "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" ${WEB_URL}/Install +curl --connect-timeout 600 --max-time 601 ${WEB_URL}/Install # Downloading tools wget -nc https://getcomposer.org/composer.phar diff --git a/var.sh b/var.sh index 9fb3359..4633453 100644 --- a/var.sh +++ b/var.sh @@ -6,7 +6,7 @@ ROOT_PATH="${BASE_PATH}/Orange-Management" BUILD_PATH="Build" RELEASE_PATH="Release" TEST_PATH="Tests" -WEB_URL="http://orange-management.de" +WEB_URL="http://orange-management.de/Orange-Management" MAIL_ADDR="" DB_USER="root" DB_PASSWORD="123456" @@ -18,15 +18,18 @@ GITHUB_URL[2]="https://github.com/Orange-Management/Console.git" GITHUB_URL[3]="https://github.com/Orange-Management/cssOMS.git" GITHUB_URL[4]="https://github.com/Orange-Management/Demo.git" GITHUB_URL[5]="https://github.com/Orange-Management/Docs.git" +GITHUB_URL[5]="https://github.com/Orange-Management/Documentation.git" GITHUB_URL[6]="https://github.com/Orange-Management/Install.git" GITHUB_URL[7]="https://github.com/Orange-Management/jsOMS.git" GITHUB_URL[8]="https://github.com/Orange-Management/Model.git" +GITHUB_URL[8]="https://github.com/Orange-Management/Modules.git" GITHUB_URL[9]="https://github.com/Orange-Management/phpOMS.git" GITHUB_URL[10]="https://github.com/Orange-Management/Release.git" GITHUB_URL[11]="https://github.com/Orange-Management/Resources.git" GITHUB_URL[12]="https://github.com/Orange-Management/Socket.git" GITHUB_URL[13]="https://github.com/Orange-Management/Tests.git" GITHUB_URL[14]="https://github.com/Orange-Management/Web.git" +GITHUB_URL[14]="https://github.com/Orange-Management/Website.git" GIT_BRANCH="develop"