-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/webhooks
# Conflicts: # ASC.Web.sln # common/ASC.Api.Core/Core/BaseStartup.cs # common/services/ASC.Data.Backup/ASC.Data.Backup.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj
- Loading branch information
Showing
631 changed files
with
36,154 additions
and
27,370 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,4 +14,5 @@ Data/ | |
| Logs/ | ||
| **/.DS_Store | ||
| .eslintcache | ||
| build/deploy/ | ||
| build/deploy/ | ||
| /public/debuginfo.md | ||
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| PUSHD %~dp0 | ||
| call runasadmin.bat "%~dpnx0" | ||
| if %errorlevel% == 0 ( | ||
|
|
||
| call start\stop.bat | ||
|
|
||
| PUSHD %~dp0.. | ||
|
|
||
| echo "FRONT-END static" | ||
| call build\build.static.bat --personal | ||
|
|
||
| echo "BACK-END" | ||
| call build\build.backend.bat | ||
|
|
||
| start /b call build\start\start.bat | ||
|
|
||
| pause | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| package_sysname="onlyoffice"; | ||
| DS_COMMON_NAME="onlyoffice"; | ||
| product="appserver" | ||
| GIT_BRANCH="develop" | ||
| RES_APP_INSTALLED="is already installed"; | ||
| RES_APP_CHECK_PORTS="uses ports" | ||
| RES_CHECK_PORTS="please, make sure that the ports are free."; | ||
| RES_INSTALL_SUCCESS="Thank you for installing ONLYOFFICE ${product^^}."; | ||
| RES_QUESTIONS="In case you have any questions contact us via http://support.onlyoffice.com or visit our forum at http://dev.onlyoffice.org" | ||
|
|
||
| while [ "$1" != "" ]; do | ||
| case $1 in | ||
|
|
||
| -u | --update ) | ||
| if [ "$2" != "" ]; then | ||
| UPDATE=$2 | ||
| shift | ||
| fi | ||
| ;; | ||
|
|
||
| -gb | --gitbranch ) | ||
| if [ "$2" != "" ]; then | ||
| PARAMETERS="$PARAMETERS ${1}"; | ||
| GIT_BRANCH=$2 | ||
| shift | ||
| fi | ||
| ;; | ||
|
|
||
| -ls | --localscripts ) | ||
| if [ "$2" != "" ]; then | ||
| LOCAL_SCRIPTS=$2 | ||
| shift | ||
| fi | ||
| ;; | ||
|
|
||
| -? | -h | --help ) | ||
| echo " Usage $0 [PARAMETER] [[PARAMETER], ...]" | ||
| echo " Parameters:" | ||
| echo " -it, --installation_type installation type (COMMUNITY|ENTERPRISE|DEVELOPER)" | ||
| echo " -u, --update use to update existing components (true|false)" | ||
| echo " -ls, --local_scripts use 'true' to run local scripts (true|false)" | ||
| echo " -?, -h, --help this help" | ||
| echo | ||
| exit 0 | ||
| ;; | ||
|
|
||
| esac | ||
| shift | ||
| done | ||
|
|
||
| if [ -z "${UPDATE}" ]; then | ||
| UPDATE="false"; | ||
| fi | ||
|
|
||
| if [ -z "${LOCAL_SCRIPTS}" ]; then | ||
| LOCAL_SCRIPTS="false"; | ||
| fi | ||
|
|
||
| if [ $(dpkg-query -W -f='${Status}' curl 2>/dev/null | grep -c "ok installed") -eq 0 ]; then | ||
| apt-get update; | ||
| apt-get install -yq curl; | ||
| fi | ||
|
|
||
| DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/build/install/OneClickInstall/install-Debian" | ||
| if [ "${LOCAL_SCRIPTS}" == "true" ]; then | ||
| source install-Debian/bootstrap.sh | ||
| else | ||
| source <(curl ${DOWNLOAD_URL_PREFIX}/bootstrap.sh) | ||
| fi | ||
|
|
||
| # add onlyoffice repo | ||
| echo "deb http://download.onlyoffice.com/repo/debian squeeze main" | tee /etc/apt/sources.list.d/onlyoffice.list | ||
| apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 | ||
| echo "deb http://static.teamlab.info.s3.amazonaws.com/repo/4testing/debian stable main" | sudo tee /etc/apt/sources.list.d/onlyoffice4testing.list | ||
|
|
||
| declare -x LANG="en_US.UTF-8" | ||
| declare -x LANGUAGE="en_US:en" | ||
| declare -x LC_ALL="en_US.UTF-8" | ||
|
|
||
| if [ "${LOCAL_SCRIPTS}" == "true" ]; then | ||
| source install-Debian/tools.sh | ||
| source install-Debian/check-ports.sh | ||
| source install-Debian/install-preq.sh | ||
| source install-Debian/install-app.sh | ||
| else | ||
| source <(curl ${DOWNLOAD_URL_PREFIX}/tools.sh) | ||
| source <(curl ${DOWNLOAD_URL_PREFIX}/check-ports.sh) | ||
| source <(curl ${DOWNLOAD_URL_PREFIX}/install-preq.sh) | ||
| source <(curl ${DOWNLOAD_URL_PREFIX}/install-app.sh) | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| cat<<EOF | ||
| ####################################### | ||
| # BOOTSTRAP | ||
| ####################################### | ||
| EOF | ||
|
|
||
| if ! dpkg -l | grep -q "sudo"; then | ||
| apt-get install -yq sudo | ||
| fi | ||
|
|
||
| if ! dpkg -l | grep -q "net-tools"; then | ||
| apt-get install -yq net-tools | ||
| fi | ||
|
|
||
| if ! dpkg -l | grep -q "dirmngr"; then | ||
| apt-get install -yq dirmngr | ||
| fi |
39 changes: 39 additions & 0 deletions
39
build/install/OneClickInstall/install-Debian/check-ports.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| cat<<EOF | ||
| ####################################### | ||
| # CHECK PORTS | ||
| ####################################### | ||
| EOF | ||
|
|
||
| if dpkg -l | grep -q "${product}"; then | ||
| echo "${product} $RES_APP_INSTALLED" | ||
| APPSERVER_INSTALLED="true"; | ||
| elif [ $UPDATE != "true" ] && netstat -lnp | awk '{print $4}' | grep -qE ":80$|:8081$|:8083$|:5001$|:5002$|:8080$|:80$"; then | ||
| echo "${product} $RES_APP_CHECK_PORTS: 80, 8081, 8083, 5001, 5002"; | ||
| echo "$RES_CHECK_PORTS" | ||
| exit | ||
| else | ||
| APPSERVER_INSTALLED="false"; | ||
| fi | ||
|
|
||
| if dpkg -l | grep -q "${package_sysname}-documentserver"; then | ||
| echo "${package_sysname}-documentserver $RES_APP_INSTALLED" | ||
| DOCUMENT_SERVER_INSTALLED="true"; | ||
| elif [ $UPDATE != "true" ] && netstat -lnp | awk '{print $4}' | grep -qE ":8083$|:5432$|:5672$|:6379$|:8000$|:8080$"; then | ||
| echo "${package_sysname}-documentserver $RES_APP_CHECK_PORTS: 8083, 5432, 5672, 6379, 8000, 8080"; | ||
| echo "$RES_CHECK_PORTS" | ||
| exit | ||
| else | ||
| DOCUMENT_SERVER_INSTALLED="false"; | ||
| fi | ||
|
|
||
| if [ "$APPSERVER_INSTALLED" = "true" ] || [ "$DOCUMENT_SERVER_INSTALLED" = "true" ]; then | ||
| if [ "$UPDATE" != "true" ]; then | ||
| exit; | ||
| fi | ||
| fi |
Oops, something went wrong.