Move static websites from hetznix to nixedo
This commit is contained in:
parent
c2e4f80364
commit
ebf9778b42
24 changed files with 211 additions and 257 deletions
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
services.caddy.enable = true;
|
||||
|
||||
imports = [ ./vhosts ];
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."bootstrap-with-tailwind.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/bootstrap-with-tailwind.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,18 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
./bootstrap-with-tailwind.oliverdavies.uk.nix
|
||||
./eric.nix
|
||||
./florida-drupalcamp-tailwind-css.oliverdavies.uk.nix
|
||||
./luke.oliverdavies.uk.nix
|
||||
./phpsw-sculpin-demo.oliverdavies.uk.nix
|
||||
./rebuilding-acquia.oliverdavies.uk.nix
|
||||
./rebuilding-bartik.oliverdavies.uk.nix
|
||||
./rebuilding-bristol-js.oliverdavies.uk.nix
|
||||
./rebuilding-symfony.oliverdavies.uk.nix
|
||||
./tailwindcss-demo.oliverdavies.uk.nix
|
||||
./talking-drupal-tailwindcss.oliverdavies.uk.nix
|
||||
./wp-tailwind.oliverdavies.uk.nix
|
||||
./www.oliverdavies.uk.nix
|
||||
./zet.oliverdavies.uk.nix
|
||||
];
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."eric.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/eric
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."florida-drupalcamp-tailwind-css.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/florida-drupalcamp-tailwind-css.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."luke.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/luke.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."phpsw-sculpin-demo.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/phpsw-sculpin-demo.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."rebuilding-acquia.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/rebuilding-acquia.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."rebuilding-bartik.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/rebuilding-bartik.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."rebuilding-bristol-js.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/rebuilding-bristol-js.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."rebuilding-symfony.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/rebuilding-symfony.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."tailwindcss-demo.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/tailwindcss-demo.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."talking-drupal-tailwindcss.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/talking-drupal-tailwindcss.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."wp-tailwind.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/wp-tailwind.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
File diff suppressed because it is too large
Load diff
|
@ -1,71 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts = {
|
||||
"oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
redir https://www.oliverdavies.uk{uri}
|
||||
'';
|
||||
};
|
||||
|
||||
"www.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig =
|
||||
let
|
||||
tomePaths = [
|
||||
"core"
|
||||
"sites/default/files"
|
||||
"themes/custom/opdavies"
|
||||
"tome-test"
|
||||
];
|
||||
|
||||
tomeConfig = builtins.concatStringsSep "\n\n" (
|
||||
builtins.map (path: ''
|
||||
handle /${path} {
|
||||
root * /var/www/vhosts/www.oliverdavies.uk-tome
|
||||
file_server
|
||||
}
|
||||
|
||||
handle_path /${path}/* {
|
||||
root * /var/www/vhosts/www.oliverdavies.uk-tome/${path}
|
||||
file_server
|
||||
}
|
||||
'') tomePaths
|
||||
);
|
||||
|
||||
redirects = import ./www.oliverdavies.uk-redirects.nix;
|
||||
|
||||
redirectLines = builtins.concatStringsSep "\n" (
|
||||
map (r: "redir ${r.from} ${r.to} permanent") redirects
|
||||
);
|
||||
in
|
||||
''
|
||||
encode gzip
|
||||
file_server
|
||||
root * /var/www/vhosts/www.oliverdavies.uk-sculpin
|
||||
|
||||
handle_errors {
|
||||
@404 {
|
||||
expression {http.error.status_code} == 404
|
||||
}
|
||||
|
||||
rewrite @404 /404/index.html
|
||||
file_server
|
||||
}
|
||||
|
||||
${tomeConfig}
|
||||
|
||||
@articles path_regexp ^/articles/(.*)$
|
||||
@talks path_regexp ^/talks/(.*)$
|
||||
@talks-archive path_regexp ^/talks/archive/(.*)$
|
||||
|
||||
redir @articles /blog/{re.1} permanent
|
||||
redir @talks-archive /presentations/{re.1} permanent
|
||||
redir @talks /presentations/{re.1} permanent
|
||||
|
||||
${redirectLines}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.caddy.virtualHosts."zet.oliverdavies.uk" = {
|
||||
useACMEHost = "oliverdavies.uk";
|
||||
|
||||
extraConfig = ''
|
||||
encode gzip
|
||||
root * /var/www/vhosts/zet.oliverdavies.uk
|
||||
file_server
|
||||
header X-Robots-Tag "noindex, nofollow"
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
imports = [
|
||||
./caddy
|
||||
./jitsi.nix
|
||||
./openssl.nix
|
||||
];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue