IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cosmetic and functional fixes in packages

Browse Source
This commit is contained in:
Evgeniy Antonyuk 2023-04-26 12:00:11 +05:00
parent c8994dda20
commit 71a3ae2cd0
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/install/OneClickInstall/install-Debian.sh
View File

@ -68,12 +68,12 @@ while [ "$1" != "" ]; do
-? | -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 " -je, --jwtenabled specifies the enabling the JWT validation (true|false)"
echo " -jh, --jwtheader defines the http header that will be used to send the JWT"
echo " -js, --jwtsecret defines the secret key to validate the JWT in the request"
echo " -ls, --local_scripts use 'true' to run local scripts (true|false)"
echo " -skiphc, --skiphardwarecheck use to skip hardware check (true|false)"
echo " -?, -h, --help this help"
echo
exit 0

14
build/install/OneClickInstall/install-Docker.sh
View File

@ -306,8 +306,9 @@ while [ "$1" != "" ]; do
echo " -hub, --hub dockerhub name"
echo " -un, --username dockerhub username"
echo " -p, --password dockerhub password"
echo " -u, --update use to update existing components (true|false)"
echo " -ids, --installdocspace install or update $PRODUCT (true|false)"
echo " -tag, --dockertag select the version to install $PRODUCT (latest|develop|version number)"
echo " -tag, --dockertag select the $PRODUCT version (latest|version number)"
echo " -idocs, --installdocumentserver install or update document server (true|false)"
echo " -di, --documentserverimage document server image name"
echo " -jh, --jwtheader defines the http header that will be used to send the JWT"
@ -320,14 +321,13 @@ while [ "$1" != "" ]; do
echo " -mysqlu, --mysqluser $PRODUCT database user"
echo " -mysqlp, --mysqlpassword $PRODUCT database password"
echo " -mysqlh, --mysqlhost mysql server host"
echo " -dsh, --docspdcehost $PRODUCT host"
echo " -dsh, --docspacehost $PRODUCT host"
echo " -esh, --elasticsearchhost elasticsearch host"
echo " -env, --environment $PRODUCT environment"
echo " -skiphc, --skiphardwarecheck skip hardware check (true|false)"
echo " -ip, --internalport internal $PRODUCT port (default value 5050)"
echo " -ep, --externalport external $PRODUCT port (default value 80)"
echo " -mk, --machinekey setting for core.machinekey"
echo " -ls, --local_scripts run the installation from local scripts"
echo " -dbm, --databasemigration database migration (true|false)"
echo " -?, -h, --help this help"
echo
@ -559,7 +559,7 @@ install_docker_compose () {
}
check_ports () {
RESERVED_PORTS=(443 2181 2888 3306 3888 8081 8099 9092 9200 9300 9800 9899 9999 33060);
RESERVED_PORTS=(3306 8092);
ARRAY_PORTS=();
USED_PORTS="";
@ -762,7 +762,7 @@ set_jwt_secret () {
fi
fi
if [[ -z ${JWT_SECRET} ]] && [[ "$UPDATE" != "true" ]]; then
if [[ -z ${JWT_SECRET} ]]; then
DOCUMENT_SERVER_JWT_SECRET=$(get_random_str 32);
fi
}
@ -997,9 +997,9 @@ start_installation () {
root_checking
get_os_info
check_os_info
check_kernel
if [ "$UPDATE" != "true" ]; then
check_ports
fi

1
build/install/OneClickInstall/install-RedHat.sh
View File

@ -83,6 +83,7 @@ while [ "$1" != "" ]; do
echo " -jh, --jwtheader defines the http header that will be used to send the JWT"
echo " -js, --jwtsecret defines the secret key to validate the JWT in the request"
echo " -ls, --local_scripts use 'true' to run local scripts (true|false)"
echo " -skiphc, --skiphardwarecheck use to skip hardware check (true|false)"
echo " -?, -h, --help this help"
echo
exit 0

2
build/install/common/product-configuration
View File

@ -227,7 +227,7 @@ install_json() {
}
restart_services() {
sed -e "s/ENVIRONMENT=.*/ENVIRONMENT=$ENVIRONMENT/" -e "s/environment=.*/environment=$ENVIRONMENT/" -i /lib/systemd/system/${PRODUCT}*.service >/dev/null 2>&1
sed "s_\(ENVIRONMENT=\).*_\1${ENVIRONMENT}_i" -i /lib/systemd/system/${PRODUCT}*.service >/dev/null 2>&1
systemctl daemon-reload
echo -n "Updating database... "

3
build/install/deb/debian/product-radicale.postinst
View File

@ -6,6 +6,9 @@ set -e
DIR="/var/www/{{product}}"
[ -f /usr/lib/python3.$(python3 -c 'import sys; print(sys.version_info.minor)')/EXTERNALLY-MANAGED ] && \
rm /usr/lib/python3.$(python3 -c 'import sys; print(sys.version_info.minor)')/EXTERNALLY-MANAGED
python3 -m pip install --upgrade pip
python3 -m pip install --upgrade requests
python3 -m pip install --upgrade setuptools