bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

S3: removed unnecessary gateways

Browse source
This commit is contained in:
Filippo Berto 2023-08-15 11:57:26 +02:00
parent a02853e64f
commit f4b2644bd1
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
9 changed files with 60 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
instances/baldur/hm.nix
View file

@ -19,7 +19,7 @@
Wants = [ "network.target" "network-online.target" ];
};
Service = {
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_baldur_key.path},use_path_request_style,url=http://localhost:3900";
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_baldur_key.path},use_path_request_style,url=http://freya.local:3900";
Restart = "always";
RestartSec = 30;
Type = "exec";

2
instances/baldur/hm_tiziano.nix
View file

@ -18,7 +18,7 @@
Wants = [ "network.target" "network-online.target" ];
};
Service = {
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_baldur_key.path},use_path_request_style,url=http://localhost:3900";
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_baldur_key.path},use_path_request_style,url=http://freya.local:3900";
Restart = "always";
RestartSec = 30;
Type = "exec";

3
instances/odin/common_configuration.nix
View file

@ -186,8 +186,7 @@ with lib; {
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages =
builtins.attrValues { inherit (pkgs) tmux helix vim git ntfs3g s3fs; };
environment.systemPackages = builtins.attrValues { inherit (pkgs) tmux helix vim git ntfs3g; };
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.

31
instances/odin/hm.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nixosConfig, ... }: {
{ pkgs, ... }: {
home = {
language.base = "it_IT.UTF-8";
keyboard = {
@ -42,35 +42,6 @@
'';
};
systemd.user.services.garage-home-s3-bertof =
let
path = "/home/bertof/s3/bertof";
in
{
Unit = {
After = [ "network.target" "network-online.target" "local-fs.target" ];
# AssertPathIsDirectory = path;
# AssertPathIsReadWrite = path;
Description = "Mount S3 bucket in bertof's home";
StartLimitBurst = 5;
StartLimitInterval = 200;
Wants = [ "network.target" "network-online.target" ];
};
Service = {
ExecStart = pkgs.writeShellScript "garage-home-s3-bertof" ''
set -e
${pkgs.coreutils}/bin/mkdir -p '${path}'
${pkgs.s3fs}/bin/s3fs -f -d bertof ${path} -o passwd_file=${nixosConfig.age.secrets.garage_bertof_odin_key.path},use_path_request_style,url=http://localhost:3900
'';
Restart = "always";
RestartSec = 30;
Type = "exec";
};
Install = {
# WantedBy = [ "default.target" ];
};
};
imports = [
../../modules/hm/__basic.nix

23
instances/thor/hm.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nixosConfig, ... }: {
{ pkgs, ... }: {
home = {
language.base = "it_IT.UTF-8";
keyboard = {
@ -31,27 +31,6 @@
};
};
systemd.user.services.garage-home-s3-bertof = {
Unit = {
After = [ "network.target" "network-online.target" "local-fs.target" ];
AssertPathIsDirectory = "/home/bertof/s3/bertof";
AssertPathIsReadWrite = "/home/bertof/s3/bertof";
Description = "Mount S3 bucket in bertof's home";
StartLimitBurst = 5;
StartLimitInterval = 200;
Wants = [ "network.target" "network-online.target" ];
};
Service = {
ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3/bertof -o passwd_file=${nixosConfig.age.secrets.garage_bertof_thor_key.path},use_path_request_style,url=http://localhost:3900";
Restart = "always";
RestartSec = 30;
Type = "exec";
};
Install = {
WantedBy = [ "default.target" ];
};
};
services = { gnome-keyring.enable = true; };
imports = [