This commit is contained in:
shimun 2020-12-18 20:51:36 +01:00
parent 8b414ad669
commit 3091529899
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
2 changed files with 67 additions and 5 deletions

62
mod.nix Normal file
View File

@ -0,0 +1,62 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.services.brownpaper;
in
{
options.services.brownpaper = {
enable = mkEnableOption "brownpaper service";
listen = mkOption {
type = types.str;
default = "0.0.0.0";
};
port = mkOption {
type = types.int;
default = 3000;
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/brownpaper";
};
user = mkOption {
type = types.str;
default = "brownpaper";
};
pgpKeys = mkOption {
type = with types; listOf path;
default = [ ];
};
};
config = mkIf cfg.enable {
users.users."${cfg.user}" = { };
systemd.services.brownpaper = {
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
path = [ pkgs.coreutils ];
environment.BROWNPAPER_STORAGE_DIR = "${toString cfg.dataDir}";
serviceConfig =
let
keyDir = pkgs.runCommand "brownpaper-keys" { } ''
mkdir -p $out
${concatStringsSep " && " (builtins.map (key: "ln -s ${key} $out") cfg.pgpKeys)}
'';
keyScript = pkgs.writeScript "brownpaper-keyscript" ''
DATADIR='${toString cfg.dataDir}'
[ -d "$DATADIR/keys" ] && mv "$DATADIR/keys" "$DATADIR/keys.bak"
[ -e "$DATADIR/keys" ] && rm "$DATADIR/keys"
ln -s ${keyDir} "$DATADIR/keys"
'';
in
{
ExecStartPre = "+${pkgs.bash}/bin/bash -c '${concatStringsSep " && "
([
"mkdir -p ${toString cfg.dataDir}"
"chown ${toString cfg.user} ${toString cfg.dataDir}"
] ++ (optionals (cfg.pgpKeys != [ ]) [ "${keyScript}" ])) }'";
ExecStart = "${(pkgs.callPackage ./. { inherit pkgs; src = ./.; }).server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
User = cfg.user;
};
};
};
}

View File

@ -30,11 +30,11 @@ use std::path::Path;
use std::sync::Arc;
use std::sync::Mutex;
const STORAGE_DIR: &str = "./snips";
lazy_static! {
static ref STORAGE_DIR: String =
env::var("BROWNPAPER_STORAGE_DIR").unwrap_or("/snips".to_string());
static ref KNOWN_KEYS: Arc<Mutex<KnownKeys>> = Arc::new(Mutex::new(
KnownKeys::load_dir([STORAGE_DIR, "keys"].join("/")).expect("Failed to load pubkeys")
KnownKeys::load_dir([&*STORAGE_DIR, "keys"].join("/")).expect("Failed to load pubkeys")
));
}
@ -42,7 +42,7 @@ const VERSION: &str = env!("CARGO_PKG_VERSION");
fn handle(req: &mut Request) -> IronResult<Response> {
println!("{}", req.url);
let storage = SnippetStorage::new(&Path::new(&STORAGE_DIR));
let storage = SnippetStorage::new(&Path::new(&*STORAGE_DIR));
let segments: Vec<&str> = req.url.path();
match (&req.method, segments.first()) {
(Method::Get, Some(&"version")) => Ok(Response::with((iron::status::Ok, VERSION))),
@ -124,7 +124,7 @@ fn handle(req: &mut Request) -> IronResult<Response> {
fn main() {
let chain = Chain::new(handle);
println!("Starting brownpaper: {}", STORAGE_DIR);
println!("Starting brownpaper: {}", &*STORAGE_DIR);
Iron::new(chain).http(
args()
.skip(1)