chandlerswift/machine-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: chandlerswift:efb6bc7b9510ab1860cd0ac0cb1a407cb12c5c3e
Branches Tags
chandlerswift:main
..
compare: chandlerswift:46adf7040b1ae56dacf1a83f8e0f933e6eb719bc
Branches Tags
chandlerswift:main

No commits in common. "efb6bc7b9510ab1860cd0ac0cb1a407cb12c5c3e" and "46adf7040b1ae56dacf1a83f8e0f933e6eb719bc" have entirely different histories.
efb6bc7b95 ... 46adf7040b

6 changed files with 31 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

45
bert/services/http/chandlerswift.com.nix
View file

@ -1,45 +0,0 @@
{
services.caddy.virtualHosts."chandlerswift.com".extraConfig = ''
encode zstd gzip
file_server
root * /srv/www/chandlerswift.com
# hide .git # ???
@html_redirect {
file {path}.html
not path *.html
}
redir @html_redirect {path}.html 301
redir /.well-known/host-meta* https://social.chandlerswift.com{uri} permanent
redir /.well-known/webfinger* https://social.chandlerswift.com{uri} permanent
redir /.well-known/nodeinfo* https://social.chandlerswift.com{uri} permanent
handle_errors {
respond "{err.status_code} {err.status_text}"
}
'';
services.caddy.virtualHosts."blog.chandlerswift.com".extraConfig = ''
redir /2018/auto-timed-fish-tank-light/ https://chandlerswift.com/projects/fish-tank-light.html permanent
redir /2018/using-a-5-25-floppy-as-a-midi-instrument/ https://chandlerswift.com/projects/midi-floppy.html permanent
redir /2017/building-a-midi-pedalboard/ https://chandlerswift.com/projects/midi-pedalboard.html permanent
redir /2017/esp8266-light-switch-a-few-revisions/ https://chandlerswift.com/projects/light-switch.html permanent
redir /2016/new-relic-and-appfog-2/ https://chandlerswift.com/2016/02/18/new-relic-appfog-v2.html permanent
redir /2015/piano-heatmap-analysis-part-1/ https://chandlerswift.com/2015/09/10/piano-heatmap-part-1.html permanent
redir /2015/solving-windows-update-error-8024402f/ https://chandlerswift.com/2015/08/31/solving-8024402F.html permanent
redir /2015/enable-hotspot-rooted-s6/ https://chandlerswift.com/2015/08/30/enabling-s6-hotspot.html permanent
redir /* https://chandlerswift.com/
handle_errors {
respond "{err.status_code} {err.status_text}"
}
'';
services.caddy.virtualHosts."www.chandlerswift.com".extraConfig = "redir https://chandlerswift.com{uri}";
systemd.tmpfiles.settings."10-chandlerswift-com" = {
"/srv/www/chandlerswift.com" = {
d = {};
};
};
}

10
bert/services/http/index.nix
View file

@ -2,7 +2,6 @@
imports = [ imports = [
./0hats.com.nix ./0hats.com.nix
./bannergen.chandlerswift.com.nix ./bannergen.chandlerswift.com.nix
./chandlerswift.com.nix
./files.chandlerswift.com.nix ./files.chandlerswift.com.nix
./git.chandlerswift.com.nix ./git.chandlerswift.com.nix
./harborpaperco.com.nix ./harborpaperco.com.nix
@ -13,8 +12,6 @@
./maps.chandlerswift.com.nix ./maps.chandlerswift.com.nix
./music.chandlerswift.com.nix ./music.chandlerswift.com.nix
./preview.chandlerswift.com.nix ./preview.chandlerswift.com.nix
./social.chandlerswift.com.nix
./stjohnscccc.com.nix
./stjohnscccc.org.nix ./stjohnscccc.org.nix
./swiftgang.net.nix ./swiftgang.net.nix
./whereis.chandlerswift.com.nix ./whereis.chandlerswift.com.nix
@ -47,11 +44,8 @@
</head> </head>
<body> <body>
<h1>not found - chandlerswift.com</h1> <h1>not found - chandlerswift.com</h1>
<p> <p>This page is hosted with <a href="https://chandlerswift.com/">chandlerswift.com</a>,
You've reached a server at but the site couldn't be found.</p>
<a href="https://chandlerswift.com/">chandlerswift.com</a>,
but the requested site couldn't be found.
</p>
</body> </body>
</html> </html>
EOF 404 EOF 404

28
bert/services/http/social.chandlerswift.com.nix
View file

@ -1,28 +0,0 @@
{
services.gotosocial = {
enable = true;
settings = {
landing-page-user = "chandler";
protocol = "https";
host = "social.chandlerswift.com";
account-domain = "chandlerswift.com";
bind-address = "127.0.0.1";
port = 8001;
# log-timestamp-format = "";
storage-local-base-path = "/srv/gotosocial/storage";
db-type = "sqlite";
db-address = "/srv/gotosocial/database.sqlite";
};
};
systemd.tmpfiles.settings."10-social-chandlerswift-com" = {
"/srv/gotosocial" = {
d = {
user = "gotosocial";
};
};
};
services.caddy.virtualHosts."social.chandlerswift.com".extraConfig = ''
encode zstd gzip
reverse_proxy localhost:8001
'';
}

19
bert/services/http/stjohnscccc.com.nix
View file

@ -1,19 +0,0 @@
{
services.caddy.virtualHosts."stjohnscccc.com" = {
serverAliases = ["www.stjohnscccc.com"];
extraConfig = ''
encode zstd gzip
file_server
root * /srv/www/stjohnscccc.com
handle_errors {
respond "{err.status_code} {err.status_text}"
}
'';
};
systemd.tmpfiles.settings."10-stjohnscccc-com" = {
"/srv/www/stjohnscccc.com" = {
d = {};
};
};
}

56
bert/services/http/stjohnscccc.org.nix
View file

@ -1,6 +1,11 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }:
services.phpfpm.pools.stjohnscccc = { let
user = "stjohnscccc"; app = "stjohnscccc";
domain = "${app}.chandlerswift.com"; # TODO
dataDir = "/srv/www/stjohnscccc.org";
in {
services.phpfpm.pools.${app} = {
user = app;
settings = { settings = {
"listen.owner" = config.services.caddy.user; "listen.owner" = config.services.caddy.user;
"pm" = "dynamic"; "pm" = "dynamic";
@ -15,37 +20,32 @@
}; };
# phpEnv."PATH" = lib.makeBinPath [ pkgs.php ]; # phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
}; };
services.caddy.virtualHosts."stjohnscccc.org" = { services.caddy.virtualHosts.${domain}.extraConfig = ''
serverAliases = ["www.stjohnscccc.org"]; root * ${dataDir}/public
extraConfig = ''
root * /srv/www/stjohnscccc.org/public
redir /downloads /downloads/ handle /downloads/* {
file_server {
handle /downloads/* { browse ${./caddy-browse-template.html}
file_server { hide .gitignore
browse ${./caddy-browse-template.html}
hide .gitignore
}
} }
}
handle { handle {
encode zstd gzip encode zstd gzip
php_fastcgi unix/${config.services.phpfpm.pools.stjohnscccc.socket} php_fastcgi unix/${config.services.phpfpm.pools.${app}.socket}
file_server file_server
} }
handle_errors { handle_errors {
respond "{err.status_code} {err.status_text}" respond "{err.status_code} {err.status_text}"
} }
''; '';
}; users.users.${app} = {
users.users.stjohnscccc = {
isSystemUser = true; isSystemUser = true;
home = "/srv/www/stjohnscccc.org"; home = dataDir;
group = "stjohnscccc"; group = app;
}; };
users.groups.stjohnscccc = {}; users.groups.${app} = {};
systemd.tmpfiles.settings."10-stjohnscccc.org" = { systemd.tmpfiles.settings."10-stjohnscccc.org" = {
"/srv/www/stjohnscccc.org" = { "/srv/www/stjohnscccc.org" = {
d = {}; d = {};

5
oscar/configuration.nix
View file

@ -189,10 +189,7 @@
programs.thunderbird.enable = true; programs.thunderbird.enable = true;
programs.bash = { programs.bash.enable = true;
enable = true;
historyControl = [ "ignoredups" "ignorespace" ];
};
programs.direnv = { programs.direnv = {
enable = true; enable = true;