Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/mailcow/mailcow-dockerized into staging

Browse Source
This commit is contained in:
FreddleSpl0it 2023-01-16 15:38:48 +01:00
commit 826d32413b
1 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
generate_config.sh
View File

@ -58,6 +58,12 @@ else
exit 1 exit 1
fi fi
### If generate_config.sh is started with --dev or -d it will not check out nightly or master branch and will keep on the current branch
if [[ ${1} == "--dev" || ${1} == "-d" ]]; then
SKIP_BRANCH=y
else
SKIP_BRANCH=n
fi
if [ -f mailcow.conf ]; then if [ -f mailcow.conf ]; then
read -r -p "A config file exists and will be overwritten, are you sure you want to continue? [y/N] " response read -r -p "A config file exists and will be overwritten, are you sure you want to continue? [y/N] " response
@ -135,32 +141,44 @@ else
SKIP_SOLR=n SKIP_SOLR=n
fi fi
echo "Which branch of mailcow do you want to use?" if [[ ${SKIP_BRANCH} != y ]]; then
echo "" echo "Which branch of mailcow do you want to use?"
echo "Available Branches:" echo ""
echo "- master branch (stable updates) | default, recommended [1]" echo "Available Branches:"
echo "- nightly branch (unstable updates, testing) | not-production ready [2]" echo "- master branch (stable updates) | default, recommended [1]"
sleep 1 echo "- nightly branch (unstable updates, testing) | not-production ready [2]"
sleep 1
while [ -z "${MAILCOW_BRANCH}" ]; do while [ -z "${MAILCOW_BRANCH}" ]; do
read -r -p "Choose the Branch with it´s number [1/2] " branch read -r -p "Choose the Branch with it´s number [1/2] " branch
case $branch in case $branch in
[2]) [2])
MAILCOW_BRANCH="nightly" MAILCOW_BRANCH="nightly"
;;
*)
MAILCOW_BRANCH="master"
;; ;;
*) esac
MAILCOW_BRANCH="master" done
;;
esac git fetch --all
done git checkout -f $git_branch
elif [[ ${SKIP_BRANCH} == y ]]; then
echo -e "\033[33mEnabled Dev Mode.\033[0m"
echo -e "\033[33mNot checking out a different branch!\033[0m"
MAILCOW_BRANCH=$(git rev-parse --short $(git rev-parse @{upstream}))
else
echo -e "\033[31mCould not determine branch input..."
echo -e "\033[31mExiting."
exit 1
fi
if [ ! -z "${MAILCOW_BRANCH}" ]; then if [ ! -z "${MAILCOW_BRANCH}" ]; then
git_branch=${MAILCOW_BRANCH} git_branch=${MAILCOW_BRANCH}
fi fi
git fetch --all
git checkout -f $git_branch
[ ! -f ./data/conf/rspamd/override.d/worker-controller-password.inc ] && echo '# Placeholder' > ./data/conf/rspamd/override.d/worker-controller-password.inc [ ! -f ./data/conf/rspamd/override.d/worker-controller-password.inc ] && echo '# Placeholder' > ./data/conf/rspamd/override.d/worker-controller-password.inc
cat << EOF > mailcow.conf cat << EOF > mailcow.conf
@ -427,18 +445,37 @@ echo "Copying snake-oil certificate..."
cp -n -d data/assets/ssl-example/*.pem data/assets/ssl/ cp -n -d data/assets/ssl-example/*.pem data/assets/ssl/
# Set app_info.inc.php # Set app_info.inc.php
if [ ${git_branch} == "master" ]; then case ${git_branch} in
mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`) master)
elif [ ${git_branch} == "nightly" ]; then mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
mailcow_git_version=$(git rev-parse --short $(git rev-parse @{upstream})) ;;
mailcow_last_git_version="" nightly)
else mailcow_git_version=$(git rev-parse --short $(git rev-parse @{upstream}))
mailcow_git_version=$(git rev-parse --short HEAD) mailcow_last_git_version=""
mailcow_last_git_version="" ;;
fi *)
mailcow_git_version=$(git rev-parse --short HEAD)
mailcow_last_git_version=""
;;
esac
# if [ ${git_branch} == "master" ]; then
# mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
# elif [ ${git_branch} == "nightly" ]; then
# mailcow_git_version=$(git rev-parse --short $(git rev-parse @{upstream}))
# mailcow_last_git_version=""
# else
# mailcow_git_version=$(git rev-parse --short HEAD)
# mailcow_last_git_version=""
# fi
if [[ $SKIP_BRANCH != "y" ]]; then
mailcow_git_commit=$(git rev-parse origin/${git_branch}) mailcow_git_commit=$(git rev-parse origin/${git_branch})
mailcow_git_commit_date=$(git log -1 --format=%ci @{upstream} ) mailcow_git_commit_date=$(git log -1 --format=%ci @{upstream} )
else
mailcow_git_commit=$(git rev-parse ${git_branch})
mailcow_git_commit_date=$(git log -1 --format=%ci @{upstream} )
git_branch=$(git rev-parse --abbrev-ref HEAD)
fi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo '<?php' > data/web/inc/app_info.inc.php echo '<?php' > data/web/inc/app_info.inc.php