Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b6042f56ab27
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b119c0939780
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 8, 2020

  1. nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper 

    The OC_PASS environment variable can be used to create a user with
`occ user:add --password-from-env`. It is currently not possible to
use the `nextcloud-occ` to "non-interactively" create a user since
this variable is ignored by sudo.

(cherry picked from commit cb68231)
    @nlewo
    nlewo committed Jun 8, 2020
    Copy the full SHA
    4340dd7 View commit details

  2. flake.nix: Remove edition field 

    (cherry picked from commit 97fc8af)
    @edolstra
    edolstra committed Jun 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b119c09 View commit details
Showing with 1 addition and 3 deletions.
  1. +0 −2 flake.nix
  2. +1 −1 nixos/modules/services/web-apps/nextcloud.nix
2 changes: 0 additions & 2 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Experimental flake interface to Nixpkgs.
# See https://github.com/NixOS/rfcs/pull/49 for details.
{
edition = 201909;

description = "A collection of packages for the Nix package manager";

outputs = { self }:
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ let
cd ${cfg.package}
sudo=exec
if [[ "$USER" != nextcloud ]]; then
sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR'
sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS'
fi
export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config"
$sudo \