Merge branch 'master' of github.com:mailcow/mailcow-dockerized

master
andryyy 2021-06-03 08:37:41 +02:00
commit aebb527b05
3 changed files with 43 additions and 9 deletions

View File

@ -0,0 +1,34 @@
name: 'Close stale issues and PRs'
on:
schedule:
# Once every day at midnight UTC
- cron: "0 0 * * *"
workflow_dispatch:
jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- name: Mark/Close Stale Issues and Pull Requests 🗑️
uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 60
days-before-close: 7
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
stale-pr-message: >
This pull request has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
exempt-issue-labels: "pinned,security,enhancement"
exempt-pr-labels: "pinned,security,enhancement"
stale-issue-label: "stale"
stale-pr-label: "stale"
operations-per-run: "250"
ascending: "true"
#DRY-RUN
debug-only: "false"

View File

@ -24,7 +24,7 @@ function get_spf_allowed_hosts($check_domain, $expand_ipv6 = false) {
$mod = explode('=', $mech); $mod = explode('=', $mech);
if ($mod[0] == 'redirect') // handle a redirect if ($mod[0] == 'redirect') // handle a redirect
{ {
$hosts = get_spf_allowed_hosts($mod[1]); $hosts = get_spf_allowed_hosts($mod[1],true);
return $hosts; return $hosts;
} }
} }

View File

@ -123,7 +123,7 @@ while (($#)); do
exit 99 exit 99
fi fi
if [[ -z $(git log HEAD --pretty=format:"%H" | grep "${LATEST_REV}") ]]; then if [[ -z $(git log HEAD --pretty=format:"%H" | grep "${LATEST_REV}") ]]; then
echo "Updated code is available." echo -e "Updated code is available.\nThe changes can be found here: https://github.com/mailcow/mailcow-dockerized/commits/master"
git log --date=short --pretty=format:"%ad - %s" $(git rev-parse --short HEAD)..origin/master git log --date=short --pretty=format:"%ad - %s" $(git rev-parse --short HEAD)..origin/master
exit 0 exit 0
else else