7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Fixes number validation in forms, fixes #882

Browse Source
This commit is contained in:
andre.peters
2018-01-12 08:30:54 +01:00
parent d836f688dd
commit c07e521309
3 changed files with 233 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
helper-scripts/nextcloud.sh
View File

@@ -16,9 +16,9 @@ done
[[ ${NC_PURGE} == "y" ]] && [[ ${NC_INSTALL} == "y" ]] && { echo "Cannot use -p and -i at the same time"; }
source ./mailcow.conf
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [[ ${NC_PURGE} == "y" ]]; then
source ${SCRIPT_DIR}/../mailcow.conf
docker exec -it $(docker ps -f name=mysql-mailcow -q) mysql -uroot -p${DBROOT} -e \
"$(docker exec -it $(docker ps -f name=mysql-mailcow -q) mysql -uroot -p${DBROOT} -e "SELECT GROUP_CONCAT('DROP TABLE ', TABLE_SCHEMA, '.', TABLE_NAME SEPARATOR ';') FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME LIKE 'nc_%' AND TABLE_SCHEMA = '${DBNAME}';" -BN)"
@@ -31,7 +31,7 @@ if [[ ${NC_PURGE} == "y" ]]; then
[[ -f ./data/conf/nginx/site.nextcloud.custom ]] && mv ./data/conf/nginx/site.nextcloud.custom ./data/conf/nginx/site.nextcloud.custom-$(date +%s).bak
[[ -f ./data/conf/nginx/nextcloud.conf ]] && mv ./data/conf/nginx/nextcloud.conf ./data/conf/nginx/nextcloud.conf-$(date +%s).bak
docker-compose restart nginx-mailcow
docker restart $(docker ps -aqf name=nginx-mailcow)
elif [[ ${NC_INSTALL} == "y" ]]; then
@@ -101,7 +101,7 @@ elif [[ ${NC_INSTALL} == "y" ]]; then
cp ./data/assets/nextcloud/site.nextcloud.custom ./data/conf/nginx/
fi
docker-compose restart nginx-mailcow
docker restart $(docker ps -aqf name=nginx-mailcow)
echo "Login as admin with password: ${ADMIN_NC_PASS}"