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.

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

nixos/nextcloud-notify_push: fix connecting to mysql via socket #348114

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

Conversation

st3iny
Copy link

@st3iny st3iny commented Oct 12, 2024

Fix #310335

Hey folks, I'm a Nextcloud developer and am currently tinkering with NixOS. Here is a little fix I came up with.

Instructing Nextcloud to connect to MySQL via a socket requires setting dbhost to localhost:/run/mysqld/mysqld.sock while Postgresql requires just the path to the socket.

Thus, the notify_push service wasn't able to connect to MySQL via a socket due to a malformed DATABASE_URL env variable. The host part is omitted if a socket is detected.

I refactored and fixed the logic when MySQL is used to always include the host part and also add the socket option to the DATABASE_URL variable. Notify_push will now connects to the MySQL socket properly.

I tested this locally with a fresh Postgres and MySQL database to make sure that there are no regressions.

# Generated strings:
DATABASE_URL='mysql://nextcloud@localhost/nextcloud?socket=/run/mysqld/mysqld.sock'
DATABASE_URL='postgresql://nextcloud/nextcloud?host=/run/postgresql'

This is my first PR here so please let me know in case something needs to be adjusted.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@st3iny
Copy link
Author

st3iny commented Oct 14, 2024

cc @SuperSandro2000

@SuperSandro2000
Copy link
Member

Thanks! I don't use mysql/mariadb so I must admit I myself never tested this. 😅

if dbType == "postgresql" then "?host=${cfg.dbhost}" else
if dbType == "mysql" then "?socket=${cfg.dbhost}" else throw "unsupported dbtype"
if isPostgresql then "" else
if isMysql then "@localhost" else throw "unsupported dbtype"
Copy link
Member

Choose a reason for hiding this comment

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

We don't really want to throw inside the module system as that will not show all errors/warnings but that was already here before and we would need to refactor the database configuration a lot to bring that up to the right level. 😅

Copy link
Author

Choose a reason for hiding this comment

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

I fully agree. This whole nested if expression also looks a bit ugly.

@SuperSandro2000 SuperSandro2000 changed the title nextcloud-notify_push: fix connecting to mysql via socket nixos/nextcloud-notify_push: fix connecting to mysql via socket Oct 14, 2024
@st3iny st3iny force-pushed the fix/nextcloud/notify_push-mysql-socket branch from 2291322 to b9ca849 Compare October 14, 2024 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

nextcloud28 notify_push Failed to connect to database
3 participants