Fix: imports
This commit is contained in:
parent
36d368063a
commit
e3c3d5ee8b
7 changed files with 23 additions and 18 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, lib, ...}:
|
||||
let
|
||||
import = ../../config/globals.nix ;
|
||||
globals = import ../../config/globals.nix ;
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [
|
||||
hugo
|
||||
|
|
@ -44,7 +44,7 @@ in {
|
|||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
globals.services.levr.url = {
|
||||
"${globals.services.levr.url}" = {
|
||||
extraConfig = ''
|
||||
@http {
|
||||
protocol http
|
||||
|
|
@ -54,7 +54,7 @@ in {
|
|||
file_server
|
||||
|
||||
log {
|
||||
output file /var/log/caddy/access-${global.services.levr.url}.log
|
||||
output file /var/log/caddy/access-${globals.services.levr.url}.log
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{pkgs, ...}: let
|
||||
import ../../config/globals.nix ;
|
||||
globals = import ../../config/globals.nix ;
|
||||
porzhSite = pkgs.stdenv.mkDerivation {
|
||||
pname = "porzh-site";
|
||||
version = "1.0";
|
||||
|
|
@ -14,7 +14,7 @@ in {
|
|||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
globals.domain = {
|
||||
"${globals.domain}" = {
|
||||
serverAliases = [ "www.${globals.domain}" ];
|
||||
extraConfig = ''
|
||||
root * ${porzhSite}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue