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

nixos/dokuwiki: caddy support #122883

Closed
wants to merge 1,766 commits into from
Closed

nixos/dokuwiki: caddy support #122883

wants to merge 1,766 commits into from

Conversation

onny
Copy link
Contributor

@onny onny commented May 13, 2021

Motivation for this change

To be able to combine DokuWiki with other modules that are using Caddy. This concept is unfluenced by this pull request.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels May 13, 2021
@onny onny requested a review from 1000101 May 13, 2021 20:14
@ofborg ofborg bot added 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 13, 2021
1000101
1000101 reviewed May 14, 2021
View reviewed changes
nixos/modules/services/web-apps/dokuwiki.nix
locations."~ \\.php$" = {
extraConfig = ''
"~ \.php$" = {
extraConfig = ''
try_files $uri $uri/ /doku.php;
include ${pkgs.nginx}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket};
${lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}
Copy link
Member

@1000101 1000101 May 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Have you tried to run the tests manually? Both manual and ofborg/automated tests fail on this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for your feedback! I use nixpkgs-review wip to test the commits. Is there more I can do?

Copy link
Member

@1000101 1000101 May 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Hi @onny. Yes, there are tests that need to pass (and be updated if they need to be). It would also be great if you could try it in a live environment (I used to test it on a real VM to test more complex scenarios).

Anyway, to run at least the local tests, you should run nix-build -A nixosTests.dokuwiki from your nixpkgs repo or from nixpkgs directory when doing nixpkgs-review wip.

E.g.:

nixpkgs $ nix-review pr 122883
.cache/nixpkgs-review/pr-122883-1$ cd nixpkgs
.cache/nixpkgs-review/pr-122883-1/nixpkgs$ nix-build -A nixosTests.dokuwiki

@onny
Copy link
Contributor Author

onny commented May 16, 2021

Oh I have to add, this pull request depends on #122647 , but hope it will be merged soon :)

@onny
Copy link
Contributor Author

onny commented May 16, 2021

Oh I have to add, this pull request depends on #122647 , but hope it will be merged soon :)

Group and user support merged into Caddy now :)

@1000101
Copy link
Member

1000101 commented May 17, 2021

@GrahamcOfBorg test dokuwiki

@1000101
Copy link
Member

1000101 commented May 17, 2021

The tests are still failing/not evaluating with the same error.

fabaff and others added 18 commits May 19, 2021 14:16
@fabaff
Merge pull request #123662 from chivay/bump-karton-asciimagic
38646ec 
pythonPackages.karton-asciimagic: 1.0.0 -> 1.0.1
@fabaff
Merge pull request #123661 from chivay/bump-classifier
0443320 
pythonPackages.karton-classifier: 1.0.0 -> 1.1.0
@fabaff
Merge pull request #123670 from chivay/bump-config-extractor
5e7aac4 
pythonPackages.karton-config-extractor: 2.0.0 -> 2.0.1
@zowoq
gh: 1.10.0 -> 1.10.1
3aaa5c8 
https://github.com/cli/cli/releases/tag/v1.10.1
@markuskowa
ucx: 1.10.0 -> 1.10.1
788306b
@jtojnar
Merge pull request #123629 from dasj19/adwaita-qt-update
633b919 
adwaita-qt: 1.1.4 -> 1.3.0
@primeos
Merge pull request #123609 from berbiche/cagebreak-use-waylands-utils…
c21dd33 
…-in-test

nixos/tests/cagebreak: use wayland-info instead of wallutils
@fabaff
python3Packages.zeroconf: 0.30.0 -> 0.31.0 (#123567)
e392df4
@timokau
Merge pull request #122624 from collares/pari-2.13
6cf6470 
pari: 2.11.4 -> 2.13.1, update sage test expectations
@jtojnar
Merge pull request #123507 from jtojnar/no-flatpak-guipkgs
a858f1a 
nixos/flatpak: Remove `guiPackages` internal option
@figsoda
luaformatter: 1.3.5 -> 1.3.6
07c9306
@prusnak
bcal: cleanup package, enable aarch64-darwin build
6996896
@lheckemann
matrix-synapse: add openssl to buildInputs
f26200f 
It should be included regardless of whether tests are run or not, and
overriding the package to disable tests would break this package up
until this change.
@rhoriguchi
gnomeExtensions.fuzzy-app-search: 4 -> 4.0.1
3b34293
@r-ryantm
gensio: 2.2.4 -> 2.2.5
a9b5556
@r-ryantm
argo: 3.0.3 -> 3.0.4
1cd5a7c
@roberth
Merge pull request #122784 from hercules-ci/nixpkgs-init-nixos-instal…
74bf82a 
…l-tools

nixos-install-tools: init
@roberth
Merge pull request #123591 from hercules-ci/update-podman-compose
ff2f080 
podman-compose: 0.1.5 -> 0.2.0pre-2021-05-18
@github-actions github-actions bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation labels May 21, 2021
@onny
Copy link
Contributor Author

onny commented May 21, 2021

ups sorry, I somehow messed up git rebase :(

@onny onny closed this May 21, 2021
@ofborg ofborg bot added 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 21, 2021
@1000101
Copy link
Member

1000101 commented May 25, 2021 •
edited
Loading

ups sorry, I somehow messed up git rebase :(

That's alright, you could have just force pushed the fix, no need to close whole PR. Mistakes happen ;).

@onny onny mentioned this pull request May 25, 2021
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1000101 1000101 1000101 left review comments

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@ttuegel ttuegel Awaiting requested review from ttuegel

@zowoq zowoq Awaiting requested review from zowoq

Assignees
No one assigned
Labels
6.topic: bsd Running or building packages on BSD 6.topic: emacs Text editor 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: kernel The Linux kernel 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml 6.topic: pantheon The Pantheon desktop environment 6.topic: policy discussion 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: systemd 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.