Compare commits
No commits in common. "9b1391a9f69fd84b9cd83587188397e9efb3d8f4" and "4bd164807436bfefe28a7ea8451fb4064364da89" have entirely different histories.
9b1391a9f6
...
4bd1648074
@ -17,19 +17,12 @@
|
|||||||
./gitea.nix
|
./gitea.nix
|
||||||
./msmtp.nix
|
./msmtp.nix
|
||||||
./postgresql.nix
|
./postgresql.nix
|
||||||
./nginx.nix
|
|
||||||
./p.nix
|
|
||||||
#./pxe.nix
|
#./pxe.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Select the this using the ID to avoid mismatches
|
# Select the this using the ID to avoid mismatches
|
||||||
boot.loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2BB240G7_PHDV6462004Y240AGN";
|
boot.loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2BB240G7_PHDV6462004Y240AGN";
|
||||||
|
|
||||||
fileSystems."/nvme" = {
|
|
||||||
fsType = "ext4";
|
|
||||||
device = "/dev/disk/by-label/nvme";
|
|
||||||
};
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "hut";
|
hostName = "hut";
|
||||||
interfaces.eno1.ipv4.addresses = [ {
|
interfaces.eno1.ipv4.addresses = [ {
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
services.nginx = {
|
|
||||||
enable = true;
|
|
||||||
virtualHosts."jungle.bsc.es" = {
|
|
||||||
listen = [
|
|
||||||
{
|
|
||||||
addr = "127.0.0.1";
|
|
||||||
port = 8123;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
locations."/p/".alias = "/ceph/p/";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
22
m/hut/p.nix
22
m/hut/p.nix
@ -1,22 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
let
|
|
||||||
p = pkgs.writeShellScriptBin "p" ''
|
|
||||||
set -e
|
|
||||||
cd /ceph
|
|
||||||
pastedir="p/$USER"
|
|
||||||
mkdir -p "$pastedir"
|
|
||||||
|
|
||||||
if [ -n "$1" ]; then
|
|
||||||
out="$pastedir/$1"
|
|
||||||
else
|
|
||||||
out=$(mktemp "$pastedir/XXXXXXXX.txt")
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat > "$out"
|
|
||||||
chmod go+r "$out"
|
|
||||||
echo "https://jungle.bsc.es/$out"
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs; [ p ];
|
|
||||||
}
|
|
@ -13,22 +13,10 @@
|
|||||||
|
|
||||||
age.secrets.cephUser.file = ../../secrets/ceph-user.age;
|
age.secrets.cephUser.file = ../../secrets/ceph-user.age;
|
||||||
|
|
||||||
fileSystems."/ceph-slow" = {
|
|
||||||
fsType = "ceph";
|
|
||||||
device = "user@9c8d06e0-485f-4aaf-b16b-06d6daf1232b.cephfs=/";
|
|
||||||
options = [
|
|
||||||
"mon_addr=10.0.40.40"
|
|
||||||
"secretfile=${config.age.secrets.cephUser.path}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.cachefilesd.enable = true;
|
|
||||||
|
|
||||||
fileSystems."/ceph" = {
|
fileSystems."/ceph" = {
|
||||||
fsType = "ceph";
|
fsType = "ceph";
|
||||||
device = "user@9c8d06e0-485f-4aaf-b16b-06d6daf1232b.cephfs=/";
|
device = "user@9c8d06e0-485f-4aaf-b16b-06d6daf1232b.cephfs=/";
|
||||||
options = [
|
options = [
|
||||||
"fsc"
|
|
||||||
"mon_addr=10.0.40.40"
|
"mon_addr=10.0.40.40"
|
||||||
"secretfile=${config.age.secrets.cephUser.path}"
|
"secretfile=${config.age.secrets.cephUser.path}"
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user