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

wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements #23837

Merged
merged 1 commit into from Mar 14, 2017
Merged

wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements #23837

merged 1 commit into from Mar 14, 2017

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Mar 13, 2017 •
edited

  • Upgrade WordPress to 4.7.3. See the release notes.

  • Move the wordpress source derivation to the attribute pkgs.wordpress. This makes it easier to override.

  • Also introduce the package option for the wordpress virtual host config which defaults to pkgs.wordpress. This enables multiple wordpress installations with different versions.

  • Also fixed the test in nixos/tests/wordpress.nix.

Since this is a security update it should be cherry picked on release-16.09 and release-17.03.

@mention-bot
Copy link

@basvandijk, thanks for your PR! By analyzing the history of the files in this pull request, we identified @qknight, @grahamc and @ehmry to be potential reviewers.

@basvandijk
wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements
8025440 
* Moved the wordpress sources derivation to the attribute pkgs.wordpress. This
  makes it easier to override.

* Also introduce the `package` option for the wordpress virtual host config which
  defaults to pkgs.wordpress.

* Also fixed the test in nixos/tests/wordpress.nix.
NeQuissimus
NeQuissimus reviewed Mar 14, 2017
View reviewed changes
nixos/tests/wordpress.nix
services.mysql.enable = true;
services.mysql.package = pkgs.mysql;
services.mysql.initialScript = pkgs.writeText "start.sql" ''
CREATE DATABASE wordpress;
Copy link
Member

Choose a reason for hiding this comment

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

Why is the init not needed anymore?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because this is already being done in the startupScript.

@qknight
Copy link
Member

qknight commented Mar 14, 2017

i like it so far! why is there no entry in nixos/release.nix for the test?

@basvandijk
Copy link
Member Author

@qknight thanks and good question. @grahamc do you know?

However, getting the wordpress test in nixos/release.nix is orthogonal to this issue and should be handled in its own PR.

@qknight qknight merged commit 308c09d into NixOS:master Mar 14, 2017
@qknight
Copy link
Member

qknight commented Mar 14, 2017

the test worked on my system, i merge the stuff! thanks!

@basvandijk
Copy link
Member Author

Thanks, can this also be cherry picked on release-16.09 and release-17.03 since this is a backwards compatible security update?

@qknight
Copy link
Member

qknight commented Mar 14, 2017

if you want to do that, i will merge it. or was this a request so i will do it?

@basvandijk
Copy link
Member Author

Hi Joachim, it was meant as a request ;) But of course I can prepare the PRs if you like.

@qknight
Copy link
Member

qknight commented Mar 14, 2017

i will do it of course ;_)

globin pushed a commit that referenced this pull request Mar 15, 2017
@basvandijk @globin
wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements (#23837
bc56929 
)

* Moved the wordpress sources derivation to the attribute pkgs.wordpress. This
  makes it easier to override.

* Also introduce the `package` option for the wordpress virtual host config which
  defaults to pkgs.wordpress.

* Also fixed the test in nixos/tests/wordpress.nix.
(cherry picked from commit 308c09d)
peterhoeg pushed a commit to peterhoeg/nixpkgs that referenced this pull request Mar 16, 2017
@basvandijk @peterhoeg
wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements (Nix…
0b80aae 
…OS#23837)

* Moved the wordpress sources derivation to the attribute pkgs.wordpress. This
  makes it easier to override.

* Also introduce the `package` option for the wordpress virtual host config which
  defaults to pkgs.wordpress.

* Also fixed the test in nixos/tests/wordpress.nix.
@qknight
Copy link
Member

qknight commented Mar 18, 2017

@basvandijk
16.09 and 17.03 have been patched and we are done here!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeQuissimus NeQuissimus NeQuissimus left review comments

Assignees
No one assigned
Labels
1.severity: security 8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@basvandijk @mention-bot @qknight @NeQuissimus @LnL7