From 9f9c828bf2975723610423ac20c957a9ca7b9b84 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Thu, 9 Jul 2020 19:05:56 +0200 Subject: [PATCH 1/6] #3 fix yamllint; update test requirements (with upgrade to molecule 3) --- .yamllint | 2 + Pipfile | 7 +- Pipfile.lock | 417 +++++------------- molecule/default/INSTALL.rst | 16 - .../default/{playbook.yml => converge.yml} | 0 molecule/default/molecule.yml | 16 +- molecule/default/verify.yml | 4 +- molecule/fpm/INSTALL.rst | 16 - molecule/fpm/{playbook.yml => converge.yml} | 0 molecule/fpm/molecule.yml | 16 +- molecule/fpm/verify.yml | 4 +- test-requirements.txt | 6 +- 12 files changed, 144 insertions(+), 360 deletions(-) delete mode 100644 molecule/default/INSTALL.rst rename molecule/default/{playbook.yml => converge.yml} (100%) delete mode 100644 molecule/fpm/INSTALL.rst rename molecule/fpm/{playbook.yml => converge.yml} (100%) diff --git a/.yamllint b/.yamllint index e4871d9..583e41d 100644 --- a/.yamllint +++ b/.yamllint @@ -1,3 +1,5 @@ +--- + extends: default ignore: | diff --git a/Pipfile b/Pipfile index c36052b..ab4443f 100644 --- a/Pipfile +++ b/Pipfile @@ -6,10 +6,11 @@ verify_ssl = true [dev-packages] [packages] -ansible = "==2.8.8" -molecule = "==2.22" +ansible = "==2.8.11" +molecule = "==3.0.4" docker = "==4.1.0" -jmespath = "==0.9.4" +jmespath = "==0.9.5" +ansible-lint = "==4.2.0" [requires] python_version = "3" diff --git a/Pipfile.lock b/Pipfile.lock index f3f9ef3..3628a32 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "871606aad56c84790d05bd5acb3dfb734a5fc628ff13615223d962d29aa4be3c" + "sha256": "9c5eba6639e5e1b3a7d1035cdb28872d39c1072913fc38f42fc6a7908daa1856" }, "pipfile-spec": 6, "requires": { @@ -18,51 +18,25 @@ "default": { "ansible": { "hashes": [ - "sha256:c364ff5807cb88af29b161a3a1d88ff737f10b930a24be66d88769ee204f4536" + "sha256:156caa8b6c60b9f0d5c7d57ee0f4e46d8e226147b58546be6a8ac52925a9c191" ], "index": "pypi", - "version": "==2.8.8" + "version": "==2.8.11" }, "ansible-lint": { "hashes": [ "sha256:b9fc9a6564f5d60a4284497f966f38ef78f0e2505edbe2bd1225f1ade31c2d8a", "sha256:eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a" ], + "index": "pypi", "version": "==4.2.0" }, - "anyconfig": { - "hashes": [ - "sha256:4d6016ae6eecc5e502bc7e99ae0639c5710c5c67bde5f21b06b9eaafd9ce0e7e" - ], - "version": "==0.9.7" - }, - "appdirs": { - "hashes": [ - "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92", - "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e" - ], - "version": "==1.4.3" - }, "arrow": { "hashes": [ - "sha256:5390e464e2c5f76971b60ffa7ee29c598c7501a294bc9f5e6dadcb251a5d027b", - "sha256:70729bcc831da496ca3cb4b7e89472c8e2d27d398908155e0796179f6d2d41ee" - ], - "version": "==0.15.5" - }, - "aspy.yaml": { - "hashes": [ - "sha256:463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc", - "sha256:e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45" - ], - "version": "==1.3.0" - }, - "attrs": { - "hashes": [ - "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c", - "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72" + "sha256:a24c1de90850f6fb2033fd6bf8a11f281e84cb54825e5eabdda219e673b52aac", + "sha256:eb5d339f00072cc297d7de252a2e75f272085d1231a3723f1026d1fa91367118" ], - "version": "==19.3.0" + "version": "==0.15.6" }, "bcrypt": { "hashes": [ @@ -102,10 +76,10 @@ }, "certifi": { "hashes": [ - "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", - "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304", + "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519" ], - "version": "==2019.11.28" + "version": "==2020.4.5.1" }, "cffi": { "hashes": [ @@ -140,13 +114,6 @@ ], "version": "==1.14.0" }, - "cfgv": { - "hashes": [ - "sha256:04b093b14ddf9fd4d17c53ebfd55582d27b76ed30050193c14e560770c5360eb", - "sha256:f22b426ed59cd2ab2b54ff96608d846c33dfb8766a67f0b4a6ce130ce244414f" - ], - "version": "==3.0.0" - }, "chardet": { "hashes": [ "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", @@ -156,10 +123,10 @@ }, "click": { "hashes": [ - "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", - "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" + "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", + "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], - "version": "==7.0" + "version": "==7.1.2" }, "click-completion": { "hashes": [ @@ -167,6 +134,13 @@ ], "version": "==0.5.2" }, + "click-help-colors": { + "hashes": [ + "sha256:0d841a4058ec88c47f93ff6f32547a055f8e0a0273f6bd6cb3e08430f195131d", + "sha256:119e5faf69cfc919c995c5962326ac8fd87f11e56a371af594e3dfd8458f4c6e" + ], + "version": "==0.8" + }, "colorama": { "hashes": [ "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff", @@ -176,42 +150,41 @@ }, "cookiecutter": { "hashes": [ - "sha256:479997e1c26c51bbbaf04097ef7d82b1d91cfb03f570cb5fb5ca265c88db04ae", - "sha256:910e6c423da42c45c2614d6676485d4872c4ed1bd9531cfff59280977f98fbf5" + "sha256:430eb882d028afb6102c084bab6cf41f6559a77ce9b18dc6802e3bc0cc5f4a30", + "sha256:efb6b2d4780feda8908a873e38f0e61778c23f6a2ea58215723bcceb5b515dac" ], - "version": "==1.7.0" + "version": "==1.7.2" }, "cryptography": { "hashes": [ - "sha256:02079a6addc7b5140ba0825f542c0869ff4df9a69c360e339ecead5baefa843c", - "sha256:1df22371fbf2004c6f64e927668734070a8953362cd8370ddd336774d6743595", - "sha256:369d2346db5934345787451504853ad9d342d7f721ae82d098083e1f49a582ad", - "sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651", - "sha256:44ff04138935882fef7c686878e1c8fd80a723161ad6a98da31e14b7553170c2", - "sha256:4b1030728872c59687badcca1e225a9103440e467c17d6d1730ab3d2d64bfeff", - "sha256:58363dbd966afb4f89b3b11dfb8ff200058fbc3b947507675c19ceb46104b48d", - "sha256:6ec280fb24d27e3d97aa731e16207d58bd8ae94ef6eab97249a2afe4ba643d42", - "sha256:7270a6c29199adc1297776937a05b59720e8a782531f1f122f2eb8467f9aab4d", - "sha256:73fd30c57fa2d0a1d7a49c561c40c2f79c7d6c374cc7750e9ac7c99176f6428e", - "sha256:7f09806ed4fbea8f51585231ba742b58cbcfbfe823ea197d8c89a5e433c7e912", - "sha256:90df0cc93e1f8d2fba8365fb59a858f51a11a394d64dbf3ef844f783844cc793", - "sha256:971221ed40f058f5662a604bd1ae6e4521d84e6cad0b7b170564cc34169c8f13", - "sha256:a518c153a2b5ed6b8cc03f7ae79d5ffad7315ad4569b2d5333a13c38d64bd8d7", - "sha256:b0de590a8b0979649ebeef8bb9f54394d3a41f66c5584fff4220901739b6b2f0", - "sha256:b43f53f29816ba1db8525f006fa6f49292e9b029554b3eb56a189a70f2a40879", - "sha256:d31402aad60ed889c7e57934a03477b572a03af7794fa8fb1780f21ea8f6551f", - "sha256:de96157ec73458a7f14e3d26f17f8128c959084931e8997b9e655a39c8fde9f9", - "sha256:df6b4dca2e11865e6cfbfb708e800efb18370f5a46fd601d3755bc7f85b3a8a2", - "sha256:ecadccc7ba52193963c0475ac9f6fa28ac01e01349a2ca48509667ef41ffd2cf", - "sha256:fb81c17e0ebe3358486cd8cc3ad78adbae58af12fc2bf2bc0bb84e8090fa5ce8" - ], - "version": "==2.8" - }, - "distlib": { - "hashes": [ - "sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21" - ], - "version": "==0.3.0" + "sha256:091d31c42f444c6f519485ed528d8b451d1a0c7bf30e8ca583a0cac44b8a0df6", + "sha256:18452582a3c85b96014b45686af264563e3e5d99d226589f057ace56196ec78b", + "sha256:1dfa985f62b137909496e7fc182dac687206d8d089dd03eaeb28ae16eec8e7d5", + "sha256:1e4014639d3d73fbc5ceff206049c5a9a849cefd106a49fa7aaaa25cc0ce35cf", + "sha256:22e91636a51170df0ae4dcbd250d318fd28c9f491c4e50b625a49964b24fe46e", + "sha256:3b3eba865ea2754738616f87292b7f29448aec342a7c720956f8083d252bf28b", + "sha256:651448cd2e3a6bc2bb76c3663785133c40d5e1a8c1a9c5429e4354201c6024ae", + "sha256:726086c17f94747cedbee6efa77e99ae170caebeb1116353c6cf0ab67ea6829b", + "sha256:844a76bc04472e5135b909da6aed84360f522ff5dfa47f93e3dd2a0b84a89fa0", + "sha256:88c881dd5a147e08d1bdcf2315c04972381d026cdb803325c03fe2b4a8ed858b", + "sha256:96c080ae7118c10fcbe6229ab43eb8b090fccd31a09ef55f83f690d1ef619a1d", + "sha256:a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229", + "sha256:bb1f0281887d89617b4c68e8db9a2c42b9efebf2702a3c5bf70599421a8623e3", + "sha256:c447cf087cf2dbddc1add6987bbe2f767ed5317adb2d08af940db517dd704365", + "sha256:c4fd17d92e9d55b84707f4fd09992081ba872d1a0c610c109c18e062e06a2e55", + "sha256:d0d5aeaedd29be304848f1c5059074a740fa9f6f26b84c5b63e8b29e73dfc270", + "sha256:daf54a4b07d67ad437ff239c8a4080cfd1cc7213df57d33c97de7b4738048d5e", + "sha256:e993468c859d084d5579e2ebee101de8f5a27ce8e2159959b6673b418fd8c785", + "sha256:f118a95c7480f5be0df8afeb9a11bd199aa20afab7a96bcf20409b411a3a85f0" + ], + "version": "==2.9.2" + }, + "distro": { + "hashes": [ + "sha256:0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92", + "sha256:df74eed763e18d10d0da624258524ae80486432cd17392d9c3d96f5e83cd2799" + ], + "version": "==1.5.0" }, "docker": { "hashes": [ @@ -221,13 +194,6 @@ "index": "pypi", "version": "==4.1.0" }, - "entrypoints": { - "hashes": [ - "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", - "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451" - ], - "version": "==0.3" - }, "fasteners": { "hashes": [ "sha256:007e4d2b2d4a10093f67e932e5166722d2eab83b77724156e92ad013c6226574", @@ -235,62 +201,19 @@ ], "version": "==0.15" }, - "filelock": { - "hashes": [ - "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", - "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836" - ], - "version": "==3.0.12" - }, - "flake8": { - "hashes": [ - "sha256:45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb", - "sha256:49356e766643ad15072a789a20915d3c91dc89fd313ccd71802303fd67e4deca" - ], - "version": "==3.7.9" - }, - "future": { - "hashes": [ - "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" - ], - "version": "==0.18.2" - }, - "git-url-parse": { - "hashes": [ - "sha256:4655ee22f1d8bf7a1eb1066c1da16529b186966c6d8331f7f55686a76a9f7aef", - "sha256:7b5f4e3aeb1d693afeee67a3bd4ac063f7206c2e8e46e559f0da0da98445f117", - "sha256:9353ff40d69488ff2299b27f40e0350ad87bd5348ea6ea09a1895eda9e5733de" - ], - "version": "==1.2.2" - }, - "identify": { - "hashes": [ - "sha256:1222b648251bdcb8deb240b294f450fbf704c7984e08baa92507e4ea10b436d5", - "sha256:d824ebe21f38325c771c41b08a95a761db1982f1fc0eee37c6c97df3f1636b96" - ], - "version": "==1.4.11" - }, "idna": { "hashes": [ - "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", - "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" - ], - "version": "==2.8" - }, - "importlib-metadata": { - "hashes": [ - "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302", - "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b" + "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb", + "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa" ], - "markers": "python_version < '3.8'", - "version": "==1.5.0" + "version": "==2.9" }, "jinja2": { "hashes": [ - "sha256:93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250", - "sha256:b0eaf100007721b5c16c1fc1eecb87409464edc10469ddc9a22a27a99123be49" + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], - "version": "==2.11.1" + "version": "==2.11.2" }, "jinja2-time": { "hashes": [ @@ -301,11 +224,11 @@ }, "jmespath": { "hashes": [ - "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", - "sha256:bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c" + "sha256:695cb76fa78a10663425d5b73ddc5714eb711157e52704d69be03b1a02ba4fec", + "sha256:cca55c8d153173e21baa59983015ad0daf603f9cb799904ff057bfb8ff8dc2d9" ], "index": "pypi", - "version": "==0.9.4" + "version": "==0.9.5" }, "markupsafe": { "hashes": [ @@ -345,20 +268,13 @@ ], "version": "==1.1.1" }, - "mccabe": { - "hashes": [ - "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", - "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" - ], - "version": "==0.6.1" - }, "molecule": { "hashes": [ - "sha256:12fa4231ed69c6e7f50432588eaace36cea917a8c73c1751269ce55df32ced24", - "sha256:d9d7621167041ae2a8eb19f1f8dc23c071cdab2cd3ca80655e2c8796b4c00e09" + "sha256:29137de659d45ecdef28d107c0dc7e85ab3d5e37d5d17813430a7cc15be5b02e", + "sha256:b4f556495a0b8955ca4ac2f86b9a675b26b6adcba93206efd325a5b61d90548f" ], "index": "pypi", - "version": "==2.22" + "version": "==3.0.4" }, "monotonic": { "hashes": [ @@ -367,26 +283,6 @@ ], "version": "==1.5" }, - "more-itertools": { - "hashes": [ - "sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c", - "sha256:b1ddb932186d8a6ac451e1d95844b382f55e12686d51ca0c68b6f61f2ab7a507" - ], - "version": "==8.2.0" - }, - "nodeenv": { - "hashes": [ - "sha256:5b2438f2e42af54ca968dd1b374d14a1194848955187b0e5e4be1f73813a5212" - ], - "version": "==1.3.5" - }, - "packaging": { - "hashes": [ - "sha256:170748228214b70b672c581a3dd610ee51f733018650740e98c7df862a583f73", - "sha256:e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334" - ], - "version": "==20.1" - }, "paramiko": { "hashes": [ "sha256:920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f", @@ -396,17 +292,10 @@ }, "pathspec": { "hashes": [ - "sha256:163b0632d4e31cef212976cf57b43d9fd6b0bac6e67c26015d611a647d5e7424", - "sha256:562aa70af2e0d434367d9790ad37aed893de47f1693e4201fd1d3dca15d19b96" + "sha256:7d91249d21749788d07a2d0f94147accd8f845507400749ea19c1ec9054a12b0", + "sha256:da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061" ], - "version": "==0.7.0" - }, - "pbr": { - "hashes": [ - "sha256:139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b", - "sha256:61aa52a0f18b71c5cc58232d2cf8f8d09cd67fcad60b742a60124cb8d6951488" - ], - "version": "==5.4.4" + "version": "==0.8.0" }, "pexpect": { "hashes": [ @@ -429,30 +318,6 @@ ], "version": "==0.5.0" }, - "pre-commit": { - "hashes": [ - "sha256:8f48d8637bdae6fa70cc97db9c1dd5aa7c5c8bf71968932a380628c25978b850", - "sha256:f92a359477f3252452ae2e8d3029de77aec59415c16ae4189bcfba40b757e029" - ], - "version": "==1.21.0" - }, - "psutil": { - "hashes": [ - "sha256:094f899ac3ef72422b7e00411b4ed174e3c5a2e04c267db6643937ddba67a05b", - "sha256:10b7f75cc8bd676cfc6fa40cd7d5c25b3f45a0e06d43becd7c2d2871cbb5e806", - "sha256:1b1575240ca9a90b437e5a40db662acd87bbf181f6aa02f0204978737b913c6b", - "sha256:21231ef1c1a89728e29b98a885b8e0a8e00d09018f6da5cdc1f43f988471a995", - "sha256:28f771129bfee9fc6b63d83a15d857663bbdcae3828e1cb926e91320a9b5b5cd", - "sha256:70387772f84fa5c3bb6a106915a2445e20ac8f9821c5914d7cbde148f4d7ff73", - "sha256:b560f5cd86cf8df7bcd258a851ca1ad98f0d5b8b98748e877a0aec4e9032b465", - "sha256:b74b43fecce384a57094a83d2778cdfc2e2d9a6afaadd1ebecb2e75e0d34e10d", - "sha256:e85f727ffb21539849e6012f47b12f6dd4c44965e56591d8dec6e8bc9ab96f4a", - "sha256:fd2e09bb593ad9bdd7429e779699d2d47c1268cbde4dda95fcd1bd17544a0217", - "sha256:ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa" - ], - "markers": "sys_platform != 'win32' and sys_platform != 'cygwin'", - "version": "==5.6.7" - }, "ptyprocess": { "hashes": [ "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0", @@ -460,32 +325,12 @@ ], "version": "==0.6.0" }, - "py": { - "hashes": [ - "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa", - "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0" - ], - "version": "==1.8.1" - }, - "pycodestyle": { - "hashes": [ - "sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56", - "sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c" - ], - "version": "==2.5.0" - }, "pycparser": { "hashes": [ - "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" - ], - "version": "==2.19" - }, - "pyflakes": { - "hashes": [ - "sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", - "sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2" + "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", + "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705" ], - "version": "==2.1.1" + "version": "==2.20" }, "pynacl": { "hashes": [ @@ -513,20 +358,6 @@ ], "version": "==1.3.0" }, - "pyparsing": { - "hashes": [ - "sha256:4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f", - "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec" - ], - "version": "==2.4.6" - }, - "pytest": { - "hashes": [ - "sha256:0d5fe9189a148acc3c3eb2ac8e1ac0742cb7618c084f3d228baaec0c254b318d", - "sha256:ff615c761e25eb25df19edddc0b970302d2a9091fbce0e7213298d85fb61fef6" - ], - "version": "==5.3.5" - }, "python-dateutil": { "hashes": [ "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", @@ -536,34 +367,38 @@ }, "python-gilt": { "hashes": [ - "sha256:4fd58c128635d1f4a8c93305e648f23379ce56e23624e4c5479427fcd2d5656e", - "sha256:c7321ef1a8efddbdef657b4fd21c3eaf1b4cb24a9656d97b73a444b1feb2067a", - "sha256:e23a45a6905e6bb7aec3ff7652b48309933a6991fad4546d9e793ac7e0513f8a" + "sha256:e220ea2e7e190ee06dbfa5fafe87967858b4ac0cf53f3072fa6ece4664a42082" + ], + "version": "==1.2.3" + }, + "python-slugify": { + "hashes": [ + "sha256:a8fc3433821140e8f409a9831d13ae5deccd0b033d4744d94b31fea141bdd84c" ], - "version": "==1.2.1" + "version": "==4.0.0" }, "pyyaml": { "hashes": [ - "sha256:059b2ee3194d718896c0ad077dd8c043e5e909d9180f387ce42012662a4946d6", - "sha256:1cf708e2ac57f3aabc87405f04b86354f66799c8e62c28c5fc5f88b5521b2dbf", - "sha256:24521fa2890642614558b492b473bee0ac1f8057a7263156b02e8b14c88ce6f5", - "sha256:4fee71aa5bc6ed9d5f116327c04273e25ae31a3020386916905767ec4fc5317e", - "sha256:70024e02197337533eef7b85b068212420f950319cc8c580261963aefc75f811", - "sha256:74782fbd4d4f87ff04159e986886931456a1894c61229be9eaf4de6f6e44b99e", - "sha256:940532b111b1952befd7db542c370887a8611660d2b9becff75d39355303d82d", - "sha256:cb1f2f5e426dc9f07a7681419fe39cee823bb74f723f36f70399123f439e9b20", - "sha256:dbbb2379c19ed6042e8f11f2a2c66d39cceb8aeace421bfc29d085d93eda3689", - "sha256:e3a057b7a64f1222b56e47bcff5e4b94c4f61faac04c7c4ecb1985e18caa3994", - "sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615" + "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97", + "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76", + "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2", + "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648", + "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf", + "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f", + "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2", + "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee", + "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d", + "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c", + "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a" ], - "version": "==5.3" + "version": "==5.3.1" }, "requests": { "hashes": [ - "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", - "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" + "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee", + "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6" ], - "version": "==2.22.0" + "version": "==2.23.0" }, "ruamel.yaml": { "hashes": [ @@ -598,6 +433,14 @@ "markers": "platform_python_implementation == 'CPython' and python_version < '3.9'", "version": "==0.2.0" }, + "selinux": { + "hashes": [ + "sha256:820adcf1b4451c9cc7759848797703263ba0eb6a4cad76d73548a9e0d57b7926", + "sha256:d435f514e834e3fdc0941f6a29d086b80b2ea51b28112aee6254bd104ee42a74" + ], + "markers": "sys_platform == 'linux'", + "version": "==0.2.1" + }, "sh": { "hashes": [ "sha256:ae3258c5249493cebe73cb4e18253a41ed69262484bad36fdb3efcb8ad8870bb", @@ -621,23 +464,17 @@ }, "tabulate": { "hashes": [ - "sha256:5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8" - ], - "version": "==0.8.6" - }, - "testinfra": { - "hashes": [ - "sha256:4ed68a44137e0a552a7a5d3ed6f1db96fe9f83dd5f78a088d335e2aefae07745", - "sha256:ce90c6f06e4a03fcb1af1fa0f028baca74021dbfe5449044767b3788dcec1a46" + "sha256:ac64cb76d53b1231d364babcd72abbb16855adac7de6665122f97b593f1eb2ba", + "sha256:db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007" ], - "version": "==3.4.0" + "version": "==0.8.7" }, - "toml": { + "text-unidecode": { "hashes": [ - "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", - "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e" + "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8", + "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93" ], - "version": "==0.10.0" + "version": "==1.3" }, "tree-format": { "hashes": [ @@ -648,24 +485,10 @@ }, "urllib3": { "hashes": [ - "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", - "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" + "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527", + "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115" ], - "version": "==1.25.8" - }, - "virtualenv": { - "hashes": [ - "sha256:08f3623597ce73b85d6854fb26608a6f39ee9d055c81178dc6583803797f8994", - "sha256:de2cbdd5926c48d7b84e0300dea9e8f276f61d186e8e49223d71d91250fbaebd" - ], - "version": "==20.0.4" - }, - "wcwidth": { - "hashes": [ - "sha256:8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603", - "sha256:f28b3e8a6483e5d49e7f8949ac1a78314e740333ae305b4ba5defd3e74fb37a8" - ], - "version": "==0.1.8" + "version": "==1.25.9" }, "websocket-client": { "hashes": [ @@ -674,26 +497,12 @@ ], "version": "==0.57.0" }, - "whichcraft": { - "hashes": [ - "sha256:acdbb91b63d6a15efbd6430d1d7b2d36e44a71697e93e19b7ded477afd9fce87", - "sha256:deda9266fbb22b8c64fd3ee45c050d61139cd87419765f588e37c8d23e236dd9" - ], - "version": "==0.6.1" - }, "yamllint": { "hashes": [ - "sha256:7318e189027951983c3cb4d6bcaa1e75deef7c752320ca3ce84e407f2551e8ce", - "sha256:76912b6262fd7e0815d7b14c4c2bb2642c754d0aa38f2d3e4b4e21c77872a3bf" - ], - "version": "==1.20.0" - }, - "zipp": { - "hashes": [ - "sha256:5c56e330306215cd3553342cfafc73dda2c60792384117893f3a83f8a1209f50", - "sha256:d65287feb793213ffe11c0f31b81602be31448f38aeb8ffc2eb286c4f6f6657e" + "sha256:0fa69bf8a86182b7fe14918bdd3a30354c869966bbc7cbfff176af71bda9c806", + "sha256:59f3ff77f44e7f46be6aecdb985830f73a1c51e290b7082a7d38c2ae1940f4a9" ], - "version": "==2.2.0" + "version": "==1.23.0" } }, "develop": {} diff --git a/molecule/default/INSTALL.rst b/molecule/default/INSTALL.rst deleted file mode 100644 index e26493b..0000000 --- a/molecule/default/INSTALL.rst +++ /dev/null @@ -1,16 +0,0 @@ -******* -Install -******* - -Requirements -============ - -* Docker Engine -* docker-py - -Install -======= - -.. code-block:: bash - - $ sudo pip install docker-py diff --git a/molecule/default/playbook.yml b/molecule/default/converge.yml similarity index 100% rename from molecule/default/playbook.yml rename to molecule/default/converge.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 296216f..6c95944 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,14 +3,19 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + yamllint . + ansible-lint . platforms: - name: phptestnode image: ${DOCKER_BASE_IMAGE:-debian:stretch-slim} - privileged: true + privileged: false capabilities: - SYS_ADMIN + tmpfs: + - '/tmp' + - '/run' + - '/run/lock' volumes: - '/sys/fs/cgroup:/sys/fs/cgroup:ro' command: '/lib/systemd/systemd' @@ -23,7 +28,4 @@ provisioner: scenario: name: default verifier: - name: goss - lint: - name: yamllint - enabled: false + name: ansible diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 5f33359..04db623 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -12,10 +12,10 @@ - name: Verify hosts: all vars: - goss_version: v0.3.9 + goss_version: v0.3.13 goss_arch: amd64 goss_dst: /usr/local/bin/goss - goss_sha256sum: 5e4a51a8c0f955e5ce99851b4a15eed9f1b3b6bee17f23dabda08071775663c8 + goss_sha256sum: eb3522ff9682736ff61e2ad114de227de98debcf8a03ca66fcda3917577313e0 goss_url: "https://github.com/aelsabbahy/goss/releases/download/{{ goss_version }}/goss-linux-{{ goss_arch }}" goss_test_directory: /tmp goss_format: documentation diff --git a/molecule/fpm/INSTALL.rst b/molecule/fpm/INSTALL.rst deleted file mode 100644 index e26493b..0000000 --- a/molecule/fpm/INSTALL.rst +++ /dev/null @@ -1,16 +0,0 @@ -******* -Install -******* - -Requirements -============ - -* Docker Engine -* docker-py - -Install -======= - -.. code-block:: bash - - $ sudo pip install docker-py diff --git a/molecule/fpm/playbook.yml b/molecule/fpm/converge.yml similarity index 100% rename from molecule/fpm/playbook.yml rename to molecule/fpm/converge.yml diff --git a/molecule/fpm/molecule.yml b/molecule/fpm/molecule.yml index bc13d6d..511cfe9 100644 --- a/molecule/fpm/molecule.yml +++ b/molecule/fpm/molecule.yml @@ -3,16 +3,21 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: | + yamllint . + ansible-lint . platforms: - name: phptestnode image: ${DOCKER_BASE_IMAGE:-debian:stretch-slim} - privileged: true + privileged: false capabilities: - SYS_ADMIN volumes: - '/sys/fs/cgroup:/sys/fs/cgroup:ro' + tmpfs: + - '/tmp' + - '/run' + - '/run/lock' command: '/lib/systemd/systemd' groups: - phptest @@ -23,7 +28,4 @@ provisioner: scenario: name: fpm verifier: - name: goss - lint: - name: yamllint - enabled: false + name: ansible diff --git a/molecule/fpm/verify.yml b/molecule/fpm/verify.yml index c06c007..5cbdbc9 100644 --- a/molecule/fpm/verify.yml +++ b/molecule/fpm/verify.yml @@ -12,10 +12,10 @@ - name: Verify hosts: all vars: - goss_version: v0.3.9 + goss_version: v0.3.13 goss_arch: amd64 goss_dst: /usr/local/bin/goss - goss_sha256sum: 5e4a51a8c0f955e5ce99851b4a15eed9f1b3b6bee17f23dabda08071775663c8 + goss_sha256sum: eb3522ff9682736ff61e2ad114de227de98debcf8a03ca66fcda3917577313e0 goss_url: "https://github.com/aelsabbahy/goss/releases/download/{{ goss_version }}/goss-linux-{{ goss_arch }}" goss_test_directory: /tmp goss_format: documentation diff --git a/test-requirements.txt b/test-requirements.txt index a27aaf5..ab572c8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,4 @@ -ansible==2.8.8 -molecule==2.22 +ansible==2.9.9 +ansible-lint==4.2.0 +molecule==3.0.4 docker==4.1.0 -jmespath==0.9.4 From 6329235e48a0589a031584ed7d99b28cb5657638 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Thu, 9 Jul 2020 19:07:10 +0200 Subject: [PATCH 2/6] #3 added path vars for template; fix config tasks; improve templates adding additional configuration parameters --- defaults/main.yml | 18 ++++++++++++++++-- tasks/configure-fpm.yml | 6 +++--- tasks/configure-php.yml | 4 ++-- templates/php-fpm.conf.j2 | 3 +++ templates/php-fpm.service.j2 | 1 - templates/php.ini.j2 | 16 ++++++++-------- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ff1a503..4ed7a6f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,7 +10,18 @@ php_download_mirror_domain: es1.php.net php_download_dir: "/usr/src/php_{{ php_version }}" php_install_dir: "/usr/local/php{{ php_version.split('.') | first }}" php_unit_file_dir: "/lib/systemd/system/" -php_pid_file: /run/php-fpm.pid +php_max_execution_time: 30 +php_max_input_time: 60 +php_max_input_nesting_level: 64 +php_max_input_vars: 1000 +php_memory_limit: 128M +php_upload_max_filesize: 2M +php_max_file_uploads: 20 +php_post_max_size: 8M + +php_ini_configuration_template: + src: php.ini.j2 + dest: "{{ php_install_dir }}/lib/php.ini" # Required libs & Compile options php_required_libs: @@ -68,8 +79,11 @@ php_compile_options: php_fpm_install: false php_fpm_configuration_template: - src: templates/php/fpm/php-fpm.conf.j2 + src: php-fpm.conf.j2 dest: "{{ php_install_dir }}/etc/php-fpm.conf" +php_fpm_service_configuration_template: + src: php-fpm.service.j2 + dest: "{{ php_unit_file_dir }}/php-fpm.service" php_fpm_configuration: # alert, error, warning, notice, debug diff --git a/tasks/configure-fpm.yml b/tasks/configure-fpm.yml index 4cfb00d..11cfb7c 100644 --- a/tasks/configure-fpm.yml +++ b/tasks/configure-fpm.yml @@ -2,7 +2,7 @@ - name: PHP | Template php-fpm configuration file template: - src: php-fpm.conf.j2 + src: "{{ php_fpm_configuration_template.src }}" dest: "{{ php_fpm_configuration_template.dest }}" notify: restart php-fpm @@ -19,8 +19,8 @@ - name: PHP | Template php-fpm service file template: - src: php-fpm.service.j2 - dest: "{{ php_unit_file_dir }}/php-fpm.service" + src: "{{ php_fpm_service_configuration_template.src }}" + dest: "{{ php_fpm_service_configuration_template.dest }}" notify: restart php-fpm - name: PHP | Ensure php-fpm executable is symlinked into a standard path. diff --git a/tasks/configure-php.yml b/tasks/configure-php.yml index 3a010f5..abd5aab 100644 --- a/tasks/configure-php.yml +++ b/tasks/configure-php.yml @@ -2,8 +2,8 @@ - name: PHP | Template php.ini template: - src: php.ini.j2 - dest: "{{ php_install_dir }}/lib/php.ini" + src: "{{ php_ini_configuration_template.src }}" + dest: "{{ php_ini_configuration_template.dest }}" - name: PHP | Ensure php executable is symlinked into a standard path. file: diff --git a/templates/php-fpm.conf.j2 b/templates/php-fpm.conf.j2 index 3ef1de2..8980698 100644 --- a/templates/php-fpm.conf.j2 +++ b/templates/php-fpm.conf.j2 @@ -143,6 +143,9 @@ rlimit_core = {{ php_fpm_configuration.rlimit_core }} user = {{ value.user }} group = {{ value.group }} listen = {{ value.listen }} +{% if value.clear_env is defined %} +clear_env = {{ value.clear_env }} +{% endif %} {% if value.listen_owner is defined %} listen.owner = {{ value.listen_owner }} {% endif %} diff --git a/templates/php-fpm.service.j2 b/templates/php-fpm.service.j2 index 26e66a0..b512bf8 100644 --- a/templates/php-fpm.service.j2 +++ b/templates/php-fpm.service.j2 @@ -6,7 +6,6 @@ After=syslog.target network.target [Service] Type=simple -PIDFile={{ php_pid_file }} ExecStart=/usr/sbin/php-fpm --fpm-config {{ php_fpm_configuration_template.dest }} ExecReload=/bin/kill -USR2 $MAINPID diff --git a/templates/php.ini.j2 b/templates/php.ini.j2 index 99426d1..dc31674 100644 --- a/templates/php.ini.j2 +++ b/templates/php.ini.j2 @@ -383,7 +383,7 @@ expose_php = On ; Maximum execution time of each script, in seconds ; http://php.net/max-execution-time ; Note: This directive is hardcoded to 0 for the CLI SAPI -max_execution_time = 30 +max_execution_time = {{ php_max_execution_time }} ; Maximum amount of time each script may spend parsing request data. It's a good ; idea to limit this time on productions servers in order to eliminate unexpectedly @@ -393,18 +393,18 @@ max_execution_time = 30 ; Development Value: 60 (60 seconds) ; Production Value: 60 (60 seconds) ; http://php.net/max-input-time -max_input_time = 60 +max_input_time = {{ php_max_input_time }} ; Maximum input variable nesting level ; http://php.net/max-input-nesting-level -;max_input_nesting_level = 64 +max_input_nesting_level = {{ php_max_input_nesting_level }} ; How many GET/POST/COOKIE input variables may be accepted -;max_input_vars = 1000 +max_input_vars = {{ php_max_input_vars }} ; Maximum amount of memory a script may consume (128MB) ; http://php.net/memory-limit -memory_limit = 128M +memory_limit = {{ php_memory_limit }} ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ; @@ -672,7 +672,7 @@ auto_globals_jit = On ; Its value may be 0 to disable the limit. It is ignored if POST data reading ; is disabled through enable_post_data_reading. ; http://php.net/post-max-size -post_max_size = 8M +post_max_size = {{ php_post_max_size }} ; Automatically add files before PHP document. ; http://php.net/auto-prepend-file @@ -824,10 +824,10 @@ file_uploads = On ; Maximum allowed size for uploaded files. ; http://php.net/upload-max-filesize -upload_max_filesize = 2M +upload_max_filesize = {{ php_upload_max_filesize }} ; Maximum number of files that can be uploaded via a single request -max_file_uploads = 20 +max_file_uploads = {{ php_max_file_uploads }} ;;;;;;;;;;;;;;;;;; ; Fopen wrappers ; From 973f90730bb48887e8693b39ea60efd4d1142f69 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Thu, 9 Jul 2020 19:09:20 +0200 Subject: [PATCH 3/6] #3 updated changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ebea7a..4c6a886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## [Unreleased](https://github.com/idealista/php_role/tree/develop) +### Added +- *Updated test dependencies* @frantsao +- *#3 Added path vars for templates; fix config tasks; improve templates adding additional configuration parameters* @frantsao ## [1.1.0](https://github.com/idealista/php_role/tree/1.1.0) ## [Full Changelog](https://github.com/idealista/php_role/compare/1.0.0...1.1.0) From 0b91da676478f27b1646480f6a6352e8b87e47d8 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Thu, 9 Jul 2020 20:06:54 +0200 Subject: [PATCH 4/6] #3 fix travis configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a6a6a9..9bb48b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- dist: xenial language: python -python: "3.7" +python: "3.8" os: linux services: - docker From 3da5fd060b07993b138277689932a79f6bddf203 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Thu, 9 Jul 2020 22:30:19 +0200 Subject: [PATCH 5/6] #3 fix service configuration --- defaults/main.yml | 1 + templates/php-fpm.service.j2 | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4ed7a6f..2368dcd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,6 +10,7 @@ php_download_mirror_domain: es1.php.net php_download_dir: "/usr/src/php_{{ php_version }}" php_install_dir: "/usr/local/php{{ php_version.split('.') | first }}" php_unit_file_dir: "/lib/systemd/system/" +php_pid_file: /run/php-fpm.pid php_max_execution_time: 30 php_max_input_time: 60 php_max_input_nesting_level: 64 diff --git a/templates/php-fpm.service.j2 b/templates/php-fpm.service.j2 index b512bf8..6a02f67 100644 --- a/templates/php-fpm.service.j2 +++ b/templates/php-fpm.service.j2 @@ -5,7 +5,8 @@ Description=The PHP FastCGI Process Manager After=syslog.target network.target [Service] -Type=simple +Type=forking +PIDFile={{ php_pid_file }} ExecStart=/usr/sbin/php-fpm --fpm-config {{ php_fpm_configuration_template.dest }} ExecReload=/bin/kill -USR2 $MAINPID From b995952c077589958c612fee5afaf6204328a934 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Fri, 10 Jul 2020 09:45:02 +0200 Subject: [PATCH 6/6] #3 updated CHANGELOG and README --- CHANGELOG.md | 3 +++ README.md | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c6a886..f7bea2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## [Unreleased](https://github.com/idealista/php_role/tree/develop) + +## [1.2.0](https://github.com/idealista/php_role/tree/1.2.0) +## [Full Changelog](https://github.com/idealista/php_role/compare/1.1.0...1.2.0) ### Added - *Updated test dependencies* @frantsao - *#3 Added path vars for templates; fix config tasks; improve templates adding additional configuration parameters* @frantsao diff --git a/README.md b/README.md index 630d08b..15a4660 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ These instructions will get you a copy of the role for your Ansible playbook. On ### Prerequisities -Ansible >= 2.8.x.x version installed. +Ansible >= 2.9.x.x version installed. Inventory destination should be a Debian environment. -For testing purposes, [Molecule](https://molecule.readthedocs.io/) (version 2.x) with [Docker](https://www.docker.com/) as provider. +For testing purposes, [Molecule](https://molecule.readthedocs.io/) (version 3.x) with [Docker](https://www.docker.com/) as provider. ### Installing @@ -34,7 +34,7 @@ Create or add to your roles dependency file (e.g requirements.yml): ``` yml - src: idealista.php_role - version: 1.1.0 + version: 1.2.0 name: php ``` @@ -82,7 +82,9 @@ molecule test -s fpm ## Built With -![Ansible](https://img.shields.io/badge/ansible-2.8.8.0-green.svg) +![Ansible](https://img.shields.io/badge/ansible-2.9.9-green.svg) +![Molecule](https://img.shields.io/badge/molecule-3.0.4-green.svg) +![Goss](https://img.shields.io/badge/goss-0.3.13-green.svg) ## Versioning