From ef8c5827a0c7f63109b5141a76f166c408f8aaec Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Thu, 27 Jul 2023 14:08:43 +0200 Subject: [PATCH] Include template dev config file, ignore the one actually being used --- .dev-config.yml | 33 --------------------------------- .gitignore | 1 + README.md | 1 + config.yml.tpl | 14 ++++++++++++++ flake.nix | 5 ++++- 5 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 .dev-config.yml create mode 100644 config.yml.tpl diff --git a/.dev-config.yml b/.dev-config.yml deleted file mode 100644 index 2ddd0e2..0000000 --- a/.dev-config.yml +++ /dev/null @@ -1,33 +0,0 @@ -origin: - store_dir_path: /tmp/domani_dev_env/origin -domain: - store_dir_path: /tmp/domani_dev_env/domain - builtins: - bar: - kind: git - url: a - branch_name: b - public: true -service: - http: - form_method: GET - proxied_domains: - foo: - url: http://127.0.0.1:9000 - request_headers: - - name: x-foo - value: BAR - - name: host - value: hi - - name: user-agent - value: "" - gemini: - proxied_domains: - mediocregopher.com: - url: gemini://127.0.0.1:1965 - passphrase: foobar - dns_records: - - kind: A - addr: 127.0.0.1 - - kind: AAAA - addr: ::1 diff --git a/.gitignore b/.gitignore index fc5ecd1..f3598f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target .cargo /result +config.yml diff --git a/README.md b/README.md index 1bcca0f..ae8367a 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,7 @@ In order to open a shell with all necessary tooling (expected rust toolchain versions, etc...) simply do: ``` +cp config.yml.tpl config.yml nix develop ``` diff --git a/config.yml.tpl b/config.yml.tpl new file mode 100644 index 0000000..82bb900 --- /dev/null +++ b/config.yml.tpl @@ -0,0 +1,14 @@ +# This is an example configuration file intended for use in development. + +origin: + store_dir_path: /tmp/domani_dev_env/origin +domain: + store_dir_path: /tmp/domani_dev_env/domain +service: + passphrase: foobar + primary_domain: localhost + dns_records: + - kind: A + addr: 127.0.0.1 + - kind: AAAA + addr: ::1 diff --git a/flake.nix b/flake.nix index c500ab0..096fae5 100644 --- a/flake.nix +++ b/flake.nix @@ -48,8 +48,11 @@ pkgs.nmap # ncat ]; shellHook = '' - source $(pwd)/.env.dev export CARGO_HOME=$(pwd)/.cargo + + if [ -f "config.yml" ]; then + export DOMANI_CONFIG_PATH=config.yml + fi ''; } // opensslEnv); });