Skip to content

Commit 3bb4f58

Browse files
committed
Remove unused microvm system
1 parent abcce5d commit 3bb4f58

File tree

4 files changed

+4
-254
lines changed

4 files changed

+4
-254
lines changed

dev/firecracker.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

dev/flake.lock

Lines changed: 4 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/flake.nix

Lines changed: 0 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
inputs.nixpkgs.follows = "nixpkgs";
99
url = "github:john-shaffer/hyperfine-flake";
1010
};
11-
microvm = {
12-
url = "github:microvm-nix/microvm.nix";
13-
inputs.nixpkgs.follows = "nixpkgs";
14-
};
1511
process-compose-flake.url = "github:Platonic-Systems/process-compose-flake";
1612
services-flake.url = "github:juspay/services-flake";
1713
wordpress-flake = {
@@ -52,45 +48,6 @@
5248
opcache.jit_buffer_size = 8M
5349
upload_max_filesize=1024M
5450
'';
55-
nixosModules = {
56-
wordpress-server = {
57-
security.sudo.extraRules = [
58-
{
59-
users = [ "www" ];
60-
commands = [
61-
{
62-
command = "ALL";
63-
options = [ "NOPASSWD" ];
64-
}
65-
];
66-
}
67-
];
68-
services.memcached = memcachedConfig;
69-
services.mysql = mysqlConfig;
70-
# Create the home dir on the volume
71-
systemd.tmpfiles.rules = [ "d /home/www 0755 www www -" ];
72-
users.users.nginx = {
73-
extraGroups = [ "www" ];
74-
};
75-
users.users.php = {
76-
extraGroups = [ "www" ];
77-
isSystemUser = true;
78-
group = "php";
79-
};
80-
users.users.www = {
81-
extraGroups = [
82-
"network"
83-
"wheel"
84-
];
85-
group = "www";
86-
home = "/home/www";
87-
isNormalUser = true;
88-
password = "";
89-
};
90-
users.groups.php = { };
91-
users.groups.www = { };
92-
};
93-
};
9451
in
9552
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
9653
systems = import inputs.systems;
@@ -264,82 +221,6 @@
264221
wp plugin install --activate ${wpPluginCheck}
265222
'';
266223
};
267-
wordpress-firecracker = inputs.nixpkgs.lib.nixosSystem {
268-
inherit system;
269-
pkgs = finalPkgs;
270-
modules = with finalPkgs; [
271-
inputs.microvm.nixosModules.microvm
272-
nixosModules.wordpress-server
273-
./services/wordpress-installer.nix
274-
(
275-
{ config, ... }:
276-
{
277-
environment.systemPackages = [
278-
mariadb
279-
memcached
280-
nginx
281-
php
282-
vim
283-
wp-cli
284-
];
285-
services.mysql.package = mariadb;
286-
services.nginx = {
287-
enable = true;
288-
httpConfig = nginxHttpConfig "/home/www/wordpress" config.services.phpfpm.pools.default.socket;
289-
port = serverPort;
290-
};
291-
services.phpfpm = {
292-
pools = {
293-
default = {
294-
settings = {
295-
"catch_workers_output" = "yes";
296-
"listen.owner" = config.services.nginx.user;
297-
"php_admin_value[error_log]" = "stderr";
298-
"php_admin_flag[log_errors]" = true;
299-
"pm" = "ondemand";
300-
"pm.max_children" = "5";
301-
};
302-
group = "php";
303-
user = "php";
304-
};
305-
};
306-
phpOptions = phpOptions;
307-
};
308-
services.wordpress-installer = {
309-
enable = true;
310-
package = (wpInstaller "localhost" "www" "/home/www/wordpress");
311-
user = "www";
312-
};
313-
systemd.services.nginx.serviceConfig.ProtectHome = false;
314-
systemd.services.phpfpm-default.serviceConfig.ProtectHome = lib.mkForce false;
315-
systemd.services.wordpress-installer = {
316-
after = [ "mysql.service" ];
317-
wants = [ "mysql.service" ];
318-
};
319-
}
320-
)
321-
{
322-
networking.hostName = "wordpress-firecracker";
323-
users.users.root.password = "";
324-
microvm = {
325-
hypervisor = "firecracker";
326-
socket = "control.socket";
327-
volumes = [
328-
{
329-
mountPoint = "/home";
330-
image = "home.img";
331-
size = 8096;
332-
}
333-
{
334-
mountPoint = "/var";
335-
image = "var.img";
336-
size = 8096;
337-
}
338-
];
339-
};
340-
}
341-
];
342-
};
343224
localstackImage = "docker.io/localstack/localstack:4.9.2";
344225
in
345226
with finalPkgs;
@@ -452,7 +333,6 @@
452333
inputs.hyperfine-flake.packages.${system}.scripts
453334
jq
454335
just
455-
inputs.microvm.packages.${system}.microvm
456336
nixfmt-rfc-style
457337
omnix
458338
parallel
@@ -466,13 +346,6 @@
466346
];
467347
inputsFrom = [ config.process-compose."default".services.outputs.devShell ];
468348
};
469-
packages = {
470-
#wordpress-firecracker =
471-
# wordpress-firecracker.config.microvm.declaredRunner;
472-
};
473349
};
474-
}
475-
// {
476-
inherit nixosModules;
477350
};
478351
}

dev/services/wordpress-installer.nix

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)