Skip to content

re owncloud latest#11412

Merged
matejc merged 4 commits intoNixOS:masterfrom
matejc:master-owncloud
Dec 2, 2015
Merged

re owncloud latest#11412
matejc merged 4 commits intoNixOS:masterfrom
matejc:master-owncloud

Conversation

@matejc
Copy link
Contributor

@matejc matejc commented Dec 2, 2015

Since the rebase went a bit wrong I decided to help @aborsu (#10514) with that
by creating a new branch from master and cherry-picking his commits into, that how this pull request started.
@aborsu: do check the commits if I missed something when cherry-picking commits.

@aborsu: I have reviewed your code, looks solid, and specially... it works great, I will merge it as soon as travis-ci goes green and that you recheck the commits.
I have tried with multiple versions of owncloud and this is config for nixos-container:

{ config, lib, pkgs, ... }:
with lib;
{ boot.isContainer = true;
  networking.hostName = mkDefault "owncloud";
  networking.useDHCP = false;
  services = {
    httpd = {
      enable = true;
      adminAddr="some@email.beje";
      enablePHP = true;
      virtualHosts = [
        {
          extraSubservices = [
            {
              serviceType = "owncloud";
              dbUser = "owncloud";
              dbPassword = "SECRET";
              adminUser = "owncloud";
              adminPassword = "SECRET";
              package = pkgs.owncloud82;
            }
          ];
        }
      ];
    };
    postgresql.enable = true;
  };
}

I think there is no need for #10514 to exist anymore so it should be closed.

Augustin Borsu added 4 commits December 2, 2015 20:36
This option allows user to specify a url prefix for owncloud.
By default it is set to "" and the document root will be set
to owncloud's dir.
If a prefix is set, e.g. urlPrefix = "/owncloud"
an alias will be created using that prefix to point to owncloud's
dir and owncloud will be available at http://localhost/owncloud
Commit changes default version to 7.0.10, 7.0.5 version is kept for
people reluctant to update. Needed info has also been added for
versions 8.0, 8.1 and 8.2 only the latest minor version of each
major version is included.
When an empty string was given as trusted_domain, the trusted
domain was set to be empty string instead of not beeing set.
Owncloud package used can now be set in configuration.nix using
package option.
@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @pSub and @philandstuff to be potential reviewers

@aborsu
Copy link
Contributor

aborsu commented Dec 2, 2015

@matejc
Thank you for your help.
You have all the commits, so if it is good for you it is good for me.
I'm still hoping to figure out why webdav is not working with the 8 version of owncloud, but since php is not even remotely my language of predilection I will be glad if anyone else wants to do it.

matejc added a commit that referenced this pull request Dec 2, 2015
@matejc matejc merged commit 05eb4c8 into NixOS:master Dec 2, 2015
@matejc
Copy link
Contributor Author

matejc commented Dec 2, 2015

@aborsu, thank you.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants