Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic PR to nightly from 2025-01-23T10:16:50Z #6252

Merged
merged 5 commits into from
Jan 23, 2025
Merged

Automatic PR to nightly from 2025-01-23T10:16:50Z #6252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b578ca
Merge pull request #6251 from mailcow/staging
FreddleSpl0it Jan 23, 2025
d831115
update.sh: remove accidentally added exit at end of solr volume removal
DerLinkman Jan 23, 2025
e76c0ba
Merge branch 'staging'
DerLinkman Jan 23, 2025
43f945f
dovecot: fix index timeout seconds
DerLinkman Jan 23, 2025
da02e26
[Web] Delete old session_id after regenerate
FreddleSpl0it Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/conf/dovecot/conf.d/fts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugin {
fts_filters = normalizer-icu snowball stopwords
fts_filters_en = lowercase snowball english-possessive stopwords

fts_index_timeout = 300
fts_index_timeout = 300s
}

### THIS PART WILL BE CHANGED BY MODIFYING mailcow.conf AUTOMATICALLY DURING RUNTIME! ###
Expand Down
10 changes: 5 additions & 5 deletions data/web/inc/triggers.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$username = domain_admin_sso('check', $_GET['sso_token']);

if ($username !== false) {
session_regenerate_id();
session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $username;
$_SESSION['mailcow_cc_role'] = 'domainadmin';
header('Location: /mailbox');
Expand Down Expand Up @@ -88,21 +88,21 @@
$as = check_login($login_user, $_POST["pass_user"]);

if ($as == "admin") {
session_regenerate_id();
session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "admin";
header("Location: /debug");
die();
}
elseif ($as == "domainadmin") {
session_regenerate_id();
session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "domainadmin";
header("Location: /mailbox");
die();
}
elseif ($as == "user") {
session_regenerate_id();
session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "user";
$http_parameters = explode('&', $_SESSION['index_query_string']);
Expand All @@ -127,7 +127,7 @@
unset($_SESSION['mailcow_cc_username']);
unset($_SESSION['mailcow_cc_role']);
} else {
session_regenerate_id();
session_regenerate_id(true);
}
}

Expand Down
4 changes: 2 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,14 +682,14 @@ migrate_solr_config_options() {
read -r -p "Remove $solr_volume? [y/N] " response
if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
echo -e "\e[33mRemoving $solr_volume...\e[0m"
docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" && exit
docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m"
echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m"
else
echo -e "Not removing $solr_volume. Run \`docker volume rm $solr_volume\` manually if needed."
fi
else
echo -e "\e[33mForce removing $solr_volume...\e[0m"
docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" && exit
docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m"
echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m"
fi
fi
Expand Down
Loading