aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2020-12-08 11:41:22 +0100
committerGitHub <noreply@github.com>2020-12-08 11:41:22 +0100
commite38cc06337f74c4ab841e09e4be254ddbf3faab7 (patch)
tree1d6bc1899aa8749abf2cfac21c2fe590294950d9
parentb731b96649a95825576060e8821e247b99aa8f2d (diff)
parent4c9962dd07f4249fa013dcafc3bc6ae9c8d12742 (diff)
downloadansible-clever-e38cc06337f74c4ab841e09e4be254ddbf3faab7.tar.gz
ansible-clever-e38cc06337f74c4ab841e09e4be254ddbf3faab7.tar.zst
ansible-clever-e38cc06337f74c4ab841e09e4be254ddbf3faab7.zip
Merge pull request #78 from paulrbr-fl/add-mongo-addonv2.9
dhall: Add the MongoDB addon type to the Addon sum type
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
-rw-r--r--default.nix7
-rw-r--r--dhall/Addon.dhall5
4 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index e42204f..31c3ecf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
2language: nix 2language: nix
3nix: 2.3.4 3nix: 2.3.4
4env: 4env:
5 - CUSTOM_NIX_PATH=nixpkgs=channel:nixos-20.03 5 - CUSTOM_NIX_PATH=nixpkgs=channel:nixos-20.09
6 6
7# Travis nix integration will install nix AFTER the environment variables are set 7# Travis nix integration will install nix AFTER the environment variables are set
8# and the nix installer will overide NIX_PATH variable thus we need to re-export it 8# and the nix installer will overide NIX_PATH variable thus we need to re-export it
diff --git a/README.md b/README.md
index 499dced..c7d7415 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Requirements
13 13
14This role requires [`clever-tools`](https://github.com/CleverCloud/clever-tools) CLI version `2.6.1` or higher. 14This role requires [`clever-tools`](https://github.com/CleverCloud/clever-tools) CLI version `2.6.1` or higher.
15 15
16If you want to configure this role with [Dhall](https://dhall-lang.org/) instead of YAML, the role publishes dhall bindings defined in the `dhall/package.dhall` file. These bindings will need Dhall version `1.26.0` or higher. 16If you want to configure this role with [Dhall](https://dhall-lang.org/) instead of YAML, the role publishes dhall bindings defined in the `dhall/package.dhall` file. These bindings will need Dhall version `1.29.0` or higher.
17 17
18Role Variables 18Role Variables
19-------------- 19--------------
diff --git a/default.nix b/default.nix
index 15ee01e..d68a922 100644
--- a/default.nix
+++ b/default.nix
@@ -3,9 +3,8 @@
3with pkgs; 3with pkgs;
4{ 4{
5 inherit shellcheck 5 inherit shellcheck
6 ansible_2_8; 6 ansible_2_8
7 inherit (python37Packages) 7 dhall;
8 inherit (python3Packages)
8 ansible-lint; 9 ansible-lint;
9 inherit (haskellPackages)
10 dhall_1_27_0;
11} 10}
diff --git a/dhall/Addon.dhall b/dhall/Addon.dhall
index b7ab958..4eb0613 100644
--- a/dhall/Addon.dhall
+++ b/dhall/Addon.dhall
@@ -2,6 +2,7 @@ let Addon =
2 < Postgresql : { name : Text, env_prefix : Text } 2 < Postgresql : { name : Text, env_prefix : Text }
3 | Mysql : { name : Text, env_prefix : Text } 3 | Mysql : { name : Text, env_prefix : Text }
4 | Redis : { name : Text, env_prefix : Text } 4 | Redis : { name : Text, env_prefix : Text }
5 | MongoDB : { name : Text, env_prefix : Text }
5 > 6 >
6 7
7let postgresql = 8let postgresql =
@@ -11,4 +12,6 @@ let mysql = Addon.Mysql { name = "mysql", env_prefix = "MYSQL_ADDON" }
11 12
12let redis = Addon.Redis { name = "redis", env_prefix = "REDIS" } 13let redis = Addon.Redis { name = "redis", env_prefix = "REDIS" }
13 14
14in { Type = Addon, postgresql = postgresql, mysql = mysql, redis = redis } 15let mongodb = Addon.MongoDB { name = "mongodb", env_prefix = "MONGODB_ADDON" }
16
17in { Type = Addon, postgresql, mysql, redis, mongodb }