uptade to nixos 18.03

This commit is contained in:
stubbfel
2018-04-12 21:12:57 +02:00
parent 7c53f8dd20
commit 4c61566465
2 changed files with 6 additions and 16 deletions

View File

@@ -1,29 +1,16 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
#let
# pkgs = import <nixos-unstable> {};
#in
{ {
# environment.systemPackages = [ (import <nixos-unstable> {}).gitea ];
services.nginx.virtualHosts."gitea.stubbe.rocks" = { services.nginx.virtualHosts."gitea.stubbe.rocks" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/".proxyPass = "http://localhost:3000"; locations."/".proxyPass = "http://localhost:3000";
}; };
nixpkgs.config.packageOverrides = pkgs: {
gitea = (import <nixos-unstable> {}).gitea;
};
users.users.gitea.shell = pkgs.zsh; users.users.gitea.shell = pkgs.zsh;
imports = [
<nixos-unstable/nixos/modules/services/misc/gitea.nix>
];
services.postgresql.enable = true; services.postgresql.enable = true;
services.gitea = { services.gitea = {
enable = true; enable = true;
useWizard = true; useWizard = true;
}; };
} }

View File

@@ -71,7 +71,7 @@
}; };
users.extraUsers.nextcloud.packages = [ users.extraUsers.nextcloud.packages = [
pkgs.php pkgs.php71
pkgs.php71Packages.apcu pkgs.php71Packages.apcu
pkgs.php71Packages.memcached pkgs.php71Packages.memcached
pkgs.php71Packages.redis pkgs.php71Packages.redis
@@ -108,4 +108,7 @@
opcache.save_comments=1 opcache.save_comments=1
opcache.revalidate_freq=1 opcache.revalidate_freq=1
''; '';
services.phpfpm.phpPackage = pkgs.php71;
} }