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

Jump to bottom

Place the PHP version into a variable (#2307) #2308

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Place the PHP version into a variable (#2307) #2308

wants to merge 1 commit into from

Conversation

binarykitchen
Copy link
Contributor

Also

  • trims a few trailing whitespace characters
  • gitignores VS code workspace

@binarykitchen binarykitchen mentioned this pull request Oct 1, 2023
Open
@binarykitchen binarykitchen force-pushed the feature/2307 branch 4 times, most recently from b3087af to 7d23073 Compare October 1, 2023 06:26
binarykitchen
binarykitchen commented Oct 1, 2023
View reviewed changes
CHANGELOG.md Outdated
@@ -1,6 +1,11 @@
CHANGELOG
=========

Next
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Helping you ahead to write the next changelog :)

binarykitchen
binarykitchen commented Oct 1, 2023
View reviewed changes
tools/mail.py Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nowhere else used.

@binarykitchen
Copy link
Contributor Author

Tested it with the local Vagrant file. Zero errors.

binarykitchen
binarykitchen commented Oct 1, 2023
View reviewed changes
tools/owncloud-unlockadmin.sh
@@ -8,15 +8,15 @@

source /etc/mailinabox.conf # load global vars

ADMIN=$(./mail.py user admins | head -n 1)
Copy link
Contributor Author

@binarykitchen binarykitchen Oct 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was actually just redirecting to management/cli.py, hence fixing the path.

But that file, mail.py, is still here, for backward compatibility.

@kiekerjan kiekerjan mentioned this pull request Oct 1, 2023
Closed
@binarykitchen
Copy link
Contributor Author

I've tested everything all over again:

  • Zero errors during installation
  • Nginx and doing Backups still work like a charm
  • Web update works like before

@kiekerjan
Copy link
Contributor

I think it looks ok 👍 . Just reviewed it, did not test it. Next time, I would keep out the cleanup stuff, it just makes for noise...

@binarykitchen
Copy link
Contributor Author

@kiekerjan Do you want me to move the clean-up stuff in a separate commit and trim all the trailing whitespaces everywhere in one single commit?

@kiekerjan
Copy link
Contributor

No, don't bother 😉 Something to keep in mind for next time. This pull request is not so large, so it's not so bad, but if you have a large pull request, it is distracting to have these changes in there as well.

jvolkenant
jvolkenant reviewed Oct 3, 2023
View reviewed changes
tools/mail.py Outdated Show resolved Hide resolved
@kiekerjan kiekerjan mentioned this pull request Oct 3, 2023
Open
@binarykitchen
Place the PHP version into a variable (mail-in-a-box#2307)
2a0cd8b 
Also
- trims a few trailing whitespace characters
- gitignores VS code workspace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jvolkenant jvolkenant jvolkenant left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@binarykitchen @kiekerjan @jvolkenant