run nix fmt

This commit is contained in:
jopejoe1 2024-07-10 23:02:54 +02:00
parent eab8e4b1d8
commit d5cbe31c02
61 changed files with 1299 additions and 830 deletions

View file

@ -1,4 +1,11 @@
{ config, pkgs, lib, modulesPath, self, ... }:
{
config,
pkgs,
lib,
modulesPath,
self,
...
}:
{
jopejoe1 = {
@ -13,16 +20,22 @@
gui.enable = false;
};
imports =
[
(modulesPath + "/profiles/qemu-guest.nix")
self.inputs.srvos.nixosModules.server
self.inputs.srvos.nixosModules.mixins-cloud-init
self.inputs.srvos.nixosModules.mixins-nginx
./wp-test.nix
];
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
self.inputs.srvos.nixosModules.server
self.inputs.srvos.nixosModules.mixins-cloud-init
self.inputs.srvos.nixosModules.mixins-nginx
./wp-test.nix
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
networking.useDHCP = false;
@ -44,10 +57,10 @@
#"db.missing.ninja" = {
# enableACME = true;
# forceSSL = true;
# locations."/" = {
# locations."/" = {
# proxyPass = "http://134.255.219.135:8000/";
# };
# };
# };
# };
};
services.nginx.enable = true;
@ -70,8 +83,16 @@
networking.firewall = {
enable = true;
allowedTCPPorts = [ 80 443 8000 ];
allowedUDPPorts = [ 80 443 8000 ];
allowedTCPPorts = [
80
443
8000
];
allowedUDPPorts = [
80
443
8000
];
};
users.users.fp = {
@ -88,7 +109,10 @@
services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
services.openssh.ports = [ 8081 22 ];
services.openssh.ports = [
8081
22
];
services.surrealdb.enable = false;
services.surrealdb.host = "134.255.219.135";

View file

@ -1,4 +1,9 @@
{pkgs, config, lib, ...}:
{
pkgs,
config,
lib,
...
}:
{
services.nginx = {
@ -58,7 +63,7 @@
};
};
users.users.www-wordpress= {
users.users.www-wordpress = {
isNormalUser = true;
group = "www-wordpress";
packages = with pkgs; [
@ -96,37 +101,48 @@
# ensurePermissions = { "www-wordpress.*" = "ALL PRIVILEGES"; };
# }
#];
};
};
systemd.services =
let
secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ];
secretsScript = hostStateDir: ''
# The match in this line is not a typo, see https://github.com/NixOS/nixpkgs/pull/124839
grep -q "LOOGGED_IN_KEY" "${hostStateDir}/secret-keys.php" && rm "${hostStateDir}/secret-keys.php"
if ! test -e "${hostStateDir}/secret-keys.php"; then
umask 0177
echo "<?php" >> "${hostStateDir}/secret-keys.php"
${lib.concatMapStringsSep "\n" (var: ''
echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php"
'') secretsVars}
echo "?>" >> "${hostStateDir}/secret-keys.php"
chmod 440 "${hostStateDir}/secret-keys.php"
fi
'';
in
{
"wordpress-init" = {
wantedBy = [ "multi-user.target" ];
before = [ "phpfpm-wordpress.service" ];
after = [ "mysql.service" ];
script = secretsScript "/var/www/wordpress/";
systemd.services =
let
secretsVars = [
"AUTH_KEY"
"SECURE_AUTH_KEY"
"LOGGED_IN_KEY"
"NONCE_KEY"
"AUTH_SALT"
"SECURE_AUTH_SALT"
"LOGGED_IN_SALT"
"NONCE_SALT"
];
secretsScript = hostStateDir: ''
# The match in this line is not a typo, see https://github.com/NixOS/nixpkgs/pull/124839
grep -q "LOOGGED_IN_KEY" "${hostStateDir}/secret-keys.php" && rm "${hostStateDir}/secret-keys.php"
if ! test -e "${hostStateDir}/secret-keys.php"; then
umask 0177
echo "<?php" >> "${hostStateDir}/secret-keys.php"
${
lib.concatMapStringsSep "\n" (var: ''
echo "define('${var}', '`tr -dc a-zA-Z0-9 </dev/urandom | head -c 64`');" >> "${hostStateDir}/secret-keys.php"
'') secretsVars
}
echo "?>" >> "${hostStateDir}/secret-keys.php"
chmod 440 "${hostStateDir}/secret-keys.php"
fi
'';
in
{
"wordpress-init" = {
wantedBy = [ "multi-user.target" ];
before = [ "phpfpm-wordpress.service" ];
after = [ "mysql.service" ];
script = secretsScript "/var/www/wordpress/";
serviceConfig = {
Type = "oneshot";
User = "www-wordpress";
Group = "nginx";
serviceConfig = {
Type = "oneshot";
User = "www-wordpress";
Group = "nginx";
};
};
};
};
}