hosting/selfhostblocks
1
0
Fork 0
Code Issues Activity

merge config with unit for nginx

Browse source
This commit is contained in:
ibizaman 2023-01-14 20:54:21 -08:00
parent f7a9e97a13
commit ba6f27b47c
4 changed files with 231 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nginx/mksiteconfig.nix
View file

@ -1,28 +0,0 @@
{ NginxSiteConfig
}:
{ siteConfigDir
, runtimeDirectory
, name
, port
, siteName
, siteRoot
, phpFpmSiteSocket ? ""
, dependsOn ? {}
}:
rec {
inherit name siteConfigDir;
siteConfigFile = "${siteName}.config";
nginxSocket = "${runtimeDirectory}/${siteName}.sock";
pkg = NginxSiteConfig rec {
inherit siteConfigDir siteConfigFile;
inherit phpFpmSiteSocket;
portBinding = port;
bindService = siteName;
siteSocket = nginxSocket;
serviceRoot = siteRoot;
};
inherit dependsOn;
type = "fileset";
}

24
nginx/mkunit.nix
View file

@ -1,24 +0,0 @@
{ NginxService
}:
{ name
, configDir
, configFile
, user
, group
, runtimeDirectory
, serviceSuffix
, dependsOn ? {}
}:
{
inherit name configDir configFile;
inherit user group;
inherit runtimeDirectory;
pkg = NginxService {
inherit serviceSuffix;
inherit user group;
inherit configDir configFile;
};
inherit dependsOn;
type = "systemd-unit";
}

172
nginx/siteconfig.nix
View file

@ -1,172 +0,0 @@
{ stdenv
, pkgs
, utils
}:
{ siteConfigDir
, siteConfigFile
, portBinding
, bindService
, serviceRoot ? "/usr/share/webapps/${bindService}"
, siteSocket ? null
, phpFpmSiteSocket ? null
, logLevel ? "WARN"
}:
let
listen =
if siteSocket != null then
"unix:${siteSocket}"
else
portBinding;
fastcgi =
if phpFpmSiteSocket == null then
""
else
''
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${phpFpmSiteSocket};
fastcgi_index index.php;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx;
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_FILENAME ${serviceRoot}$fastcgi_script_name;
# fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT ${serviceRoot};
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
}
'';
in
utils.mkConfigFile {
name = siteConfigFile;
dir = siteConfigDir;
content = ''
error_log syslog:server=unix:/dev/log,tag=nginx${bindService},nohostname,severity=error;
worker_processes 5;
worker_rlimit_nofile 8192;
events {
worker_connections 4096;
}
http {
access_log syslog:server=unix:/dev/log,tag=nginx${bindService},nohostname,severity=info combined;
server {
listen ${listen};
root ${serviceRoot};
index index.php index.html;
location / {
try_files $uri $uri/ =404;
}
${fastcgi}
}
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/x-javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
image/svg+xml svg svgz;
image/webp webp;
application/java-archive jar war ear;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.ms-excel xls;
application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream eot;
application/octet-stream iso img;
application/octet-stream msi msp msm;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}
default_type application/octet-stream;
gzip_types text/plain text/xml text/css
text/comma-separated-values
text/javascript application/x-javascript
application/atom+xml;
}
'';
}

193
nginx/unit.nix
View file

@ -2,17 +2,188 @@
, pkgs , pkgs
, utils , utils
}: }:
{ serviceSuffix { name
, siteName
, user ? "http" , user ? "http"
, group ? "http" , group ? "http"
, configDir ? "/etc/nginx"
, configFile ? "nginx.conf"
, pidFile ? "/run/nginx/nginx.pid" , pidFile ? "/run/nginx/nginx.pid"
}: , runtimeDirectory
{...}:
utils.systemd.mkService rec { , config ? {}
name = "nginx-${serviceSuffix}"; , dependsOn ? {}
}:
let
nginxSocket = "${runtimeDirectory}/${config.siteName}.sock";
listen =
if nginxSocket != null then
"unix:${nginxSocket}"
else
config.port;
fastcgi =
if config.phpFpmSiteSocket == null then
""
else
''
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.phpFpmSiteSocket};
fastcgi_index index.php;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx;
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_FILENAME ${config.siteRoot}$fastcgi_script_name;
# fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT ${config.siteRoot};
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
}
'';
mkConfig =
{ port
, siteName
, siteRoot ? "/usr/share/webapps/${siteName}"
, siteSocket ? null
, phpFpmSiteSocket ? null
, logLevel ? "WARN"
}: ''
error_log syslog:server=unix:/dev/log,tag=nginx${siteName},nohostname,severity=error;
worker_processes 5;
worker_rlimit_nofile 8192;
events {
worker_connections 4096;
}
http {
access_log syslog:server=unix:/dev/log,tag=nginx${siteName},nohostname,severity=info combined;
server {
listen ${listen};
root ${siteRoot};
index index.php index.html;
location / {
try_files $uri $uri/ =404;
}
${fastcgi}
}
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/x-javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
image/svg+xml svg svgz;
image/webp webp;
application/java-archive jar war ear;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.ms-excel xls;
application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream eot;
application/octet-stream iso img;
application/octet-stream msi msp msm;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}
default_type application/octet-stream;
gzip_types text/plain text/xml text/css
text/comma-separated-values
text/javascript application/x-javascript
application/atom+xml;
}
'';
configFile = pkgs.writeText "nginx.conf" (mkConfig config);
in
{
inherit name;
inherit runtimeDirectory nginxSocket;
inherit user group;
pkg = utils.systemd.mkService rec {
name = "nginx-${siteName}";
content = '' content = ''
[Unit] [Unit]
@ -20,6 +191,8 @@ utils.systemd.mkService rec {
After=network.target network-online.target After=network.target network-online.target
Wants=network-online.target systemd-networkd-wait-online.target Wants=network-online.target systemd-networkd-wait-online.target
${utils.unitDepends "After" dependsOn}
${utils.unitDepends "Wants" dependsOn}
StartLimitInterval=14400 StartLimitInterval=14400
StartLimitBurst=10 StartLimitBurst=10
@ -29,7 +202,7 @@ utils.systemd.mkService rec {
User=${user} User=${user}
Group=${group} Group=${group}
PIDFile=${pidFile} PIDFile=${pidFile}
ExecStart=${pkgs.nginx}/bin/nginx -c ${configDir}/${configFile} -g 'pid ${pidFile};' ExecStart=${pkgs.nginx}/bin/nginx -c ${configFile} -g 'pid ${pidFile};'
ExecReload=${pkgs.nginx}/bin/nginx -s reload ExecReload=${pkgs.nginx}/bin/nginx -s reload
KillMode=mixed KillMode=mixed
# Nginx verifies it can open a file under here even when configured # Nginx verifies it can open a file under here even when configured
@ -72,4 +245,8 @@ utils.systemd.mkService rec {
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
''; '';
};
inherit dependsOn;
type = "systemd-unit";
} }