robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-04 01:24:09 +02:00
Code Issues Projects Releases Wiki Activity

clenaup bootstrap a bit

Browse source
This commit is contained in:
Robin Appelman 2025-11-05 23:11:05 +01:00
commit 666b58a773
5 changed files with 97 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nix/image/haze.nix
View file

@ -39,10 +39,6 @@
phpVersion = concatStringsSep "." (take 2 (splitString "." php.version));
phpEnv = callPackage ./php.nix {inherit debug php;};
bootstrap-nginx = writeShellApplication {
name = "bootstrap-nginx";
text = readFile ./bootstrap-nginx.sh;
};
bootstrap = writeShellApplication {
name = "bootstrap";
runtimeInputs = [getent];
@ -169,7 +165,6 @@ in
fromImage = phpImage;
contents = [
tmpDir
bootstrap-nginx
bootstrap
configs
scripts
@ -187,7 +182,7 @@ in
chmod -R 0755 etc/nc
'';
config = {
Cmd = [(getExe bootstrap) ./nginx.conf ./php-fpm.conf];
Cmd = getExe bootstrap;
Env = ["EDITOR=hx" "WEBROOT=/var/www/html"];
WorkingDir = "/var/www/html";
};