Streamline formatting

This commit is contained in:
Daniel Siepmann 2023-02-07 08:57:10 +01:00
parent e945d07afc
commit 0da1c28841
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
5 changed files with 15 additions and 2 deletions

View file

@ -8,6 +8,7 @@ let
phpPackage = pkgs.php82;
in {
services = {
httpd.virtualHosts.${domain} = {
forceSSL = true;
@ -74,6 +75,7 @@ in {
</FilesMatch>
'';
};
phpfpm.pools.${domain} = {
inherit (config.services.httpd) user group;
inherit phpPackage;
@ -92,6 +94,8 @@ in {
IMAGEMAGICK_PATH = lib.makeBinPath [ pkgs.imagemagick ] + "/";
};
};
mysql.ensureDatabases = [databaseName];
};
}

View file

@ -2,21 +2,25 @@
{
imports = [
./mkcert.nix
./static-files.nix
./mailhog.localhost.nix
./daniel-siepmann.localhost.nix
];
options = {
custom.web-development = {
rootPath = lib.mkOption {
type = lib.types.path;
default = "/var/projects";
};
};
};
config = {
@ -90,5 +94,6 @@
# Changes are not reflected until reboot?
"C ${config.custom.web-development.rootPath}/own/typo3-configuration - - - - ${config.users.users.daniels.home}/.local/share/typo3-configuration"
];
};
}

View file

@ -4,8 +4,8 @@ let
domain = "mailhog.localhost";
in {
services = {
httpd.virtualHosts.${domain} = {
httpd.virtualHosts.${domain} = {
forceSSL = true;
sslServerCert = "${config.custom.web-development.certFolder}${domain}.pem";
sslServerKey = "${config.custom.web-development.certFolder}${domain}-key.pem";
@ -23,5 +23,6 @@ in {
</LocationMatch>
'';
};
};
}

View file

@ -37,6 +37,7 @@ in {
};
config = {
# TODO: Run once before httpd service starts?
environment.systemPackages = [
custom-generate-certs
@ -46,5 +47,6 @@ in {
security.pki.certificates = [
(builtins.readFile "${config.custom.web-development.certFolder}rootCA.pem")
];
};
}

View file

@ -5,8 +5,8 @@ let
documentRoot = "${config.custom.web-development.rootPath}/typo3/tea/Documentation-GENERATED-temp/Result/project/0.0.0/";
in {
services = {
httpd.virtualHosts.${domain} = {
httpd.virtualHosts.${domain} = {
forceSSL = true;
sslServerCert = "${config.custom.web-development.certFolder}${domain}.pem";
sslServerKey = "${config.custom.web-development.certFolder}${domain}-key.pem";
@ -22,5 +22,6 @@ in {
</Directory>
'';
};
};
}