Compare commits
	
		
			28 Commits
		
	
	
		
			alpine
			...
			4fae56a386
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4fae56a386 | |||
| 1d5db7bdbe | |||
| 32da3a3341 | |||
| 31a3f5832a | |||
| 3e7130b519 | |||
| bd0b6a16de | |||
| 7145298f90 | |||
| 1bfd2bc441 | |||
| 884b3b8425 | |||
| e06a0c4093 | |||
| 7ba5afcec4 | |||
| d3978e5b07 | |||
| 4150dac57b | |||
| 58bc9d191f | |||
| 96cefc7f74 | |||
| f85eb2841a | |||
| 5d506ebc65 | |||
| af49f27551 | |||
| f341d2e5eb | |||
| ceba0ea417 | |||
| a34cb1e666 | |||
| 65fc52c5e5 | |||
| 7f13c8c675 | |||
| 9c36cfb8e5 | |||
| 7f72a9eda4 | |||
| 6e96d48ea6 | |||
| db412066b3 | |||
| 63a836e2a7 | 
							
								
								
									
										245
									
								
								Pipfile.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										245
									
								
								Pipfile.lock
									
									
									
										generated
									
									
									
								
							| @@ -18,145 +18,137 @@ | |||||||
|     "default": { |     "default": { | ||||||
|         "ansible": { |         "ansible": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:ae97002e4fb1ed3de947428ff43906c76c66751fe104721cf6b25fa115dbbe8d" |                 "sha256:f561cca7fbc4daa14d98e18cd0cb74bd8b173f1501b8fa11543f6ef002de3167" | ||||||
|             ], |             ], | ||||||
|             "index": "pypi", |             "index": "pypi", | ||||||
|             "version": "==2.10.6" |             "version": "==4.1.0" | ||||||
|         }, |         }, | ||||||
|         "ansible-base": { |         "ansible-core": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:33ae323923b841f3d822f355380ce7c92610440362efeed67b4b39db41e555af" |                 "sha256:7e75827a94d47d1c3e1930d708f0ef637a3ab9a21f757aaf55deab6e9f47c682" | ||||||
|             ], |             ], | ||||||
|             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", |             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", | ||||||
|             "version": "==2.10.5" |             "version": "==2.11.1" | ||||||
|         }, |         }, | ||||||
|         "cffi": { |         "cffi": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", |                 "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813", | ||||||
|                 "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d", |                 "sha256:04c468b622ed31d408fea2346bec5bbffba2cc44226302a0de1ade9f5ea3d373", | ||||||
|                 "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a", |                 "sha256:06d7cd1abac2ffd92e65c0609661866709b4b2d82dd15f611e602b9b188b0b69", | ||||||
|                 "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec", |                 "sha256:06db6321b7a68b2bd6df96d08a5adadc1fa0e8f419226e25b2a5fbf6ccc7350f", | ||||||
|                 "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362", |                 "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06", | ||||||
|                 "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668", |                 "sha256:0f861a89e0043afec2a51fd177a567005847973be86f709bbb044d7f42fc4e05", | ||||||
|                 "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c", |                 "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea", | ||||||
|                 "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b", |                 "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee", | ||||||
|                 "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06", |                 "sha256:1bf1ac1984eaa7675ca8d5745a8cb87ef7abecb5592178406e55858d411eadc0", | ||||||
|                 "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698", |                 "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396", | ||||||
|                 "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2", |                 "sha256:24a570cd11895b60829e941f2613a4f79df1a27344cbbb82164ef2e0116f09c7", | ||||||
|                 "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c", |                 "sha256:24ec4ff2c5c0c8f9c6b87d5bb53555bf267e1e6f70e52e5a9740d32861d36b6f", | ||||||
|                 "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7", |                 "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73", | ||||||
|                 "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", |                 "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315", | ||||||
|                 "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", |                 "sha256:293e7ea41280cb28c6fcaaa0b1aa1f533b8ce060b9e701d78511e1e6c4a1de76", | ||||||
|                 "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", |                 "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1", | ||||||
|                 "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e", |                 "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49", | ||||||
|                 "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", |                 "sha256:3c3f39fa737542161d8b0d680df2ec249334cd70a8f420f71c9304bd83c3cbed", | ||||||
|                 "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", |                 "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892", | ||||||
|                 "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", |                 "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482", | ||||||
|                 "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", |                 "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058", | ||||||
|                 "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", |                 "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5", | ||||||
|                 "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01", |                 "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53", | ||||||
|                 "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", |                 "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045", | ||||||
|                 "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", |                 "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3", | ||||||
|                 "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", |                 "sha256:681d07b0d1e3c462dd15585ef5e33cb021321588bebd910124ef4f4fb71aef55", | ||||||
|                 "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", |                 "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5", | ||||||
|                 "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", |                 "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e", | ||||||
|                 "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", |                 "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c", | ||||||
|                 "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e", |                 "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369", | ||||||
|                 "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", |                 "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827", | ||||||
|                 "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", |                 "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053", | ||||||
|                 "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", |                 "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa", | ||||||
|                 "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375", |                 "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4", | ||||||
|                 "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b", |                 "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322", | ||||||
|                 "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b", |                 "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132", | ||||||
|                 "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f" |                 "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62", | ||||||
|  |                 "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa", | ||||||
|  |                 "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0", | ||||||
|  |                 "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396", | ||||||
|  |                 "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e", | ||||||
|  |                 "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991", | ||||||
|  |                 "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6", | ||||||
|  |                 "sha256:cc5a8e069b9ebfa22e26d0e6b97d6f9781302fe7f4f2b8776c3e1daea35f1adc", | ||||||
|  |                 "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1", | ||||||
|  |                 "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406", | ||||||
|  |                 "sha256:df5052c5d867c1ea0b311fb7c3cd28b19df469c056f7fdcfe88c7473aa63e333", | ||||||
|  |                 "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d", | ||||||
|  |                 "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c" | ||||||
|             ], |             ], | ||||||
|             "version": "==1.14.4" |             "version": "==1.14.5" | ||||||
|         }, |         }, | ||||||
|         "cryptography": { |         "cryptography": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d", |                 "sha256:0f1212a66329c80d68aeeb39b8a16d54ef57071bf22ff4e521657b27372e327d", | ||||||
|                 "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7", |                 "sha256:1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959", | ||||||
|                 "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901", |                 "sha256:240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6", | ||||||
|                 "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c", |                 "sha256:26965837447f9c82f1855e0bc8bc4fb910240b6e0d16a664bb722df3b5b06873", | ||||||
|                 "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244", |                 "sha256:37340614f8a5d2fb9aeea67fd159bfe4f5f4ed535b1090ce8ec428b2f15a11f2", | ||||||
|                 "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6", |                 "sha256:3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713", | ||||||
|                 "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5", |                 "sha256:3d8427734c781ea5f1b41d6589c293089704d4759e34597dce91014ac125aad1", | ||||||
|                 "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e", |                 "sha256:7ec5d3b029f5fa2b179325908b9cd93db28ab7b85bb6c1db56b10e0b54235177", | ||||||
|                 "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c", |                 "sha256:8e56e16617872b0957d1c9742a3f94b43533447fd78321514abbe7db216aa250", | ||||||
|                 "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0", |                 "sha256:de4e5f7f68220d92b7637fc99847475b59154b7a1b3868fb7385337af54ac9ca", | ||||||
|                 "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812", |                 "sha256:eb8cc2afe8b05acbd84a43905832ec78e7b3873fb124ca190f574dca7389a87d", | ||||||
|                 "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a", |                 "sha256:ee77aa129f481be46f8d92a1a7db57269a2f23052d5f2433b4621bb457081cc9" | ||||||
|                 "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030", |  | ||||||
|                 "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302" |  | ||||||
|             ], |             ], | ||||||
|             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", |             "markers": "python_version >= '3.6'", | ||||||
|             "version": "==3.3.1" |             "version": "==3.4.7" | ||||||
|         }, |         }, | ||||||
|         "jinja2": { |         "jinja2": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", |                 "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4", | ||||||
|                 "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" |                 "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4" | ||||||
|             ], |             ], | ||||||
|             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", |             "markers": "python_version >= '3.6'", | ||||||
|             "version": "==2.11.3" |             "version": "==3.0.1" | ||||||
|         }, |         }, | ||||||
|         "markupsafe": { |         "markupsafe": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", |                 "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", | ||||||
|                 "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", |                 "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64", | ||||||
|                 "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", |                 "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b", | ||||||
|                 "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", |                 "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567", | ||||||
|                 "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", |                 "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff", | ||||||
|                 "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f", |                 "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74", | ||||||
|                 "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39", |                 "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", | ||||||
|                 "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", |                 "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", | ||||||
|                 "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", |                 "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", | ||||||
|                 "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014", |                 "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", | ||||||
|                 "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f", |                 "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f", | ||||||
|                 "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", |                 "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", | ||||||
|                 "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", |                 "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", | ||||||
|                 "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", |                 "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", | ||||||
|                 "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", |                 "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914", | ||||||
|                 "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", |                 "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18", | ||||||
|                 "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", |                 "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8", | ||||||
|                 "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", |                 "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2", | ||||||
|                 "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", |                 "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d", | ||||||
|                 "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85", |                 "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", | ||||||
|                 "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1", |                 "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f", | ||||||
|                 "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", |                 "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", | ||||||
|                 "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", |                 "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833", | ||||||
|                 "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", |                 "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415", | ||||||
|                 "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850", |                 "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", | ||||||
|                 "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0", |                 "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9", | ||||||
|                 "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", |                 "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d", | ||||||
|                 "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", |                 "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", | ||||||
|                 "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb", |                 "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f", | ||||||
|                 "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", |                 "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", | ||||||
|                 "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", |                 "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94", | ||||||
|                 "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", |                 "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", | ||||||
|                 "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1", |                 "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51", | ||||||
|                 "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2", |                 "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872" | ||||||
|                 "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", |  | ||||||
|                 "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", |  | ||||||
|                 "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", |  | ||||||
|                 "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7", |  | ||||||
|                 "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", |  | ||||||
|                 "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8", |  | ||||||
|                 "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", |  | ||||||
|                 "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193", |  | ||||||
|                 "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", |  | ||||||
|                 "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b", |  | ||||||
|                 "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", |  | ||||||
|                 "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", |  | ||||||
|                 "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5", |  | ||||||
|                 "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c", |  | ||||||
|                 "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032", |  | ||||||
|                 "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", |  | ||||||
|                 "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be", |  | ||||||
|                 "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621" |  | ||||||
|             ], |             ], | ||||||
|             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", |             "markers": "python_version >= '3.6'", | ||||||
|             "version": "==1.1.1" |             "version": "==2.0.1" | ||||||
|         }, |         }, | ||||||
|         "packaging": { |         "packaging": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
| @@ -196,26 +188,33 @@ | |||||||
|                 "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", |                 "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", | ||||||
|                 "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", |                 "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", | ||||||
|                 "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", |                 "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", | ||||||
|  |                 "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", | ||||||
|                 "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", |                 "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", | ||||||
|  |                 "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", | ||||||
|                 "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", |                 "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", | ||||||
|                 "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", |                 "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", | ||||||
|  |                 "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", | ||||||
|                 "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", |                 "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", | ||||||
|  |                 "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", | ||||||
|                 "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", |                 "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", | ||||||
|  |                 "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", | ||||||
|                 "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", |                 "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", | ||||||
|                 "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", |                 "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", | ||||||
|                 "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", |                 "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", | ||||||
|                 "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc" |                 "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", | ||||||
|  |                 "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", | ||||||
|  |                 "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", | ||||||
|  |                 "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" | ||||||
|             ], |             ], | ||||||
|             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", |             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", | ||||||
|             "version": "==5.4.1" |             "version": "==5.4.1" | ||||||
|         }, |         }, | ||||||
|         "six": { |         "resolvelib": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", |                 "sha256:8113ae3ed6d33c6be0bcbf03ffeb06c0995c099b7b8aaa5ddf2e9b3b3df4e915", | ||||||
|                 "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" |                 "sha256:9b9b80d5c60e4c2a8b7fbf0712c3449dc01d74e215632e5199850c9eca687628" | ||||||
|             ], |             ], | ||||||
|             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", |             "version": "==0.5.4" | ||||||
|             "version": "==1.15.0" |  | ||||||
|         } |         } | ||||||
|     }, |     }, | ||||||
|     "develop": {} |     "develop": {} | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Once you've satisfied the the above assumptions, you can execute: | |||||||
| - Switch from `cron-apt` to [`unattended-upgrades`](https://wiki.debian.org/UnattendedUpgrades) | - Switch from `cron-apt` to [`unattended-upgrades`](https://wiki.debian.org/UnattendedUpgrades) | ||||||
|  |  | ||||||
| ## License | ## License | ||||||
| Copyright (C) 2014–2020 Alan Orth | Copyright (C) 2014–2021 Alan Orth | ||||||
|  |  | ||||||
| The contents of this repository are free software: you can redistribute | The contents of this repository are free software: you can redistribute | ||||||
| it and/or modify it under the terms of the GNU General Public License | it and/or modify it under the terms of the GNU General Public License | ||||||
|   | |||||||
							
								
								
									
										211
									
								
								host_vars/web19
									
									
									
									
									
								
							
							
						
						
									
										211
									
								
								host_vars/web19
									
									
									
									
									
								
							| @@ -1,111 +1,102 @@ | |||||||
| $ANSIBLE_VAULT;1.1;AES256 | $ANSIBLE_VAULT;1.1;AES256 | ||||||
| 66313066303030333063353236313063303262626561316535646263633936336534356437353265 | 34306437376439653731356465356166316166663031383032656231616230343637616562366138 | ||||||
| 3432356362393665303438333166643066666164363861610a643434356531666366393936353233 | 3736616236313338393264383764623465646436613764310a313831356161393637323338646362 | ||||||
| 37353036656435616361613164323038663364666464373964653337396465373061666533373938 | 65323064396134333361323934353139653931636136336134646637646331373034366532663461 | ||||||
| 6536323936393135370a666134613830306533623365363933376631313534326265666634366235 | 3263613463373536640a393733316536343039316330326534643833306430313638646462653230 | ||||||
| 36623637383636396437333735336238343434353733303764326237303033303562353237353165 | 33363065353764643233636661656131386532343436313735333865656439663061333664306364 | ||||||
| 31653866633363623764353533356262643239613531643039393335313731383038343638663830 | 34663236316434346564336436383866323432343062363730366664313233313135306463383764 | ||||||
| 36356139336363343437666230656366636132613531613339353962373435643563313734646135 | 37323865613265363462616431656565393035396433346234306331613138393038633534353936 | ||||||
| 61613330323938363063313430343738306536636233353963636665393132643162303562666531 | 65636438626166393531393832383835383962663937376565326263646563313236636366313234 | ||||||
| 61343365326634303730656133633632353936386431303631363731313730666132656334353731 | 32363764616466326232653439393937323239313866316536373966636365383664356363643264 | ||||||
| 33616537313230666462653165643535386134663166346262363535383365616431613838383863 | 64373236353139373536393362613835613466363063366334353432653764386131666438623638 | ||||||
| 65326163303966373938653033613238326634393166643630316230613065353437306237313933 | 62353639306136353934306535306230656138356165636531653866313938386262613836326162 | ||||||
| 65366131396266393236373162343866383565633030356465613461353131643562343630336566 | 36623664636336643432616664383732343964666464666362656338616630386365363662393236 | ||||||
| 30633534636634616666616462383136373830623137396366626639373230373834316563343464 | 37333663666461383635303766353633666634383133653139303138356565303538363331383830 | ||||||
| 38303333366166323238346237646165383633383264333431663530326462323432366332333630 | 34623762376235323831613032343761663931626361393231383865333939363736386234366162 | ||||||
| 62633132666439313034616465663861323064646564303963633565353734353665313138373636 | 61323366316330656539623064353733306136353166636266623166306161306336306661633332 | ||||||
| 34653639353333373737613238626535356333633833363737646330643163326131386364646365 | 32376336643464633430343937613739343362306364653361333530323532366136346333356632 | ||||||
| 64356435636635663737376239313236356361363061313731626230366336326535663866373231 | 35636239386436663539353535383364346533336532653237663566363532353164656666623466 | ||||||
| 37623262613135636538343934336262633662383266653238613965356639626339303437306633 | 64303263643934663131333265346262343430373264306265373436316330613932656466343935 | ||||||
| 38373837653737313465376231363637353561303937336138343465376638326163643065336462 | 34316264386431653463353530656463333533373031623564623038343065356162386361336364 | ||||||
| 61633236373737363633646135396565303835643336393763393933613964663435306336346636 | 35343033323538313938613062353736353763376264396161353965383831613839303362656137 | ||||||
| 38316231383363616533616437366362376664393135623765646330323161366134323263376466 | 32663332353762346130306130646536623663306332316461333737323935623932333962386361 | ||||||
| 31386332333565643764343863353039313466643962373736643533666562353766383862326134 | 37383064353135626338336661353364396464396262306331373463353838633536333635303133 | ||||||
| 31633366636365313231366337313334333130373833656135396262373136393135353039623739 | 66663462333061303662613863386134373233306138366331386266303533366264343965316165 | ||||||
| 63626463636237633963323739303961663632376330336236663134666461383965303861333835 | 64656332393036356666636564353861306336343839336532393838373033663064626337313365 | ||||||
| 38663337393930383834653936636365663966333033346562356331306430306338333761353762 | 63393636326266373136626538333734613730343439353065303230663361306239636230316332 | ||||||
| 38363733356262363161353135633836336363376232326261623264623338663230663838386330 | 63643336643661393364353330343163633538323835363235656231653232366236666665396236 | ||||||
| 35353762393839646338366365313763346339666433306532353530353261363838356639623436 | 61616436333766343266373930363162343139643063313261373664376165336134346538666663 | ||||||
| 62306437616630663039653862393466353933333763386163373035373335343834663439633039 | 39666539643832653865346539313366323162313765613933336536313661303032353061396539 | ||||||
| 34613463303436366631396462363866656533343063356265333539353038326637613063326164 | 64633635373765633232636365646638643163663862393565353461663665623532303837366339 | ||||||
| 62663833363165643436343538666565386561383335393964313839626237623031343564656632 | 35643235616132356164393733303064663937616166636532313736663162343339333436396535 | ||||||
| 35613534636437306463373466653431336562303132313462326233663561343837323331353035 | 66393565313438393165303134653639616630646335353935633038353132646565636462626464 | ||||||
| 33303336356237306464363564666136633230396635623066376564373737353335356432343231 | 62323838656133653162656331323661633166373764356465363364383438393337373265386537 | ||||||
| 66633735316466633039663338316566343739373664316335366462356237366139363731643366 | 32343364633638333731363035323436623530633566666265333965653138323564626231303062 | ||||||
| 33353039373665333232383235303932623435366638313465396333316565646134343463336330 | 30393032623434633731383530316238303138666363646336663363383632343064633937643261 | ||||||
| 65306334623631386364353364313638643930306265343363666366663164643435333834376439 | 64376265306239323134326561636539616237613538336637623265616539623639323036383165 | ||||||
| 64396434366362343733323366343232653930646565313762376436663965626562636238623066 | 31343337613832316338643138373261633631303137666236633235306234383835663332346434 | ||||||
| 63303236326362323966666630343136336563343564393833636465333832396666396638653661 | 34663763336638343734396664306666663039633764356238613562376164396136663034363330 | ||||||
| 61323561393563326437386462656266303830353730313839613136656331323938616631386235 | 61336238393137343634323239346564323033653862613739343534356531366136626337383931 | ||||||
| 30633730303838313038313263363363633136623861326662623366613461343133356261633030 | 35323436636433613835353532343630333062356639303830363362636336393062636134616462 | ||||||
| 34333732343037396131343764366535343639326333353036353038656533333339306363653435 | 31613530636266313535326334663036313064393537623239386235316464373634313031653234 | ||||||
| 39656166393265356338656631353065653630303237663761386332323530663966343864663438 | 33343035303831663638373661643235306433356230313732303539316133643566303365376534 | ||||||
| 65356365386131333236396234623537323062363539383061323832363563326435306465663234 | 65353764383531616164366139363939636465376365646466336132636661303439376333383465 | ||||||
| 66316638376436613265353662646264666138666165343763393330613765346163356138616633 | 38346131306434323166643434383032396133313338383462353661386231353034353861336263 | ||||||
| 66373338393163333435666236386239663735653135386532633135646539316665313036323763 | 64666434376663333339373939303362613132306433666236323137306333636162376335616339 | ||||||
| 38666464363432656534313263306266323066646133353765386463343264633131633936373036 | 38666531383331313135386530393230613366363463393239353535663263633536343036333435 | ||||||
| 31326138633131393962633861333036373537366163613562383033336333616130636435326331 | 31643938343665356537303430663834613964366139653566656130383437396464613166623334 | ||||||
| 66653766653065306164613335623933616135393335383438356337633239363131303237653566 | 32643834323230366664386238306436333636653962333563376234643132363461376636643837 | ||||||
| 62636263383236656136376237646363363234363232643636623333396531363461303538373662 | 61643463326135303539386436643835613333666539303165626230303636396434356136663234 | ||||||
| 36313537393238626337613964623731666261316366346666323261386661643035353164613637 | 34643533353236663365336632633466363361613264626564323230643432356434393033316364 | ||||||
| 32303061336363306335306431613263646266303038323739636662326465303961616339333461 | 39653733336431303932633137633762383033383365643863373763393032373233623736613635 | ||||||
| 65626263366333333562386461636231636438623966626136663932303035343531363234356663 | 39343235386132633337653338613763653361346339316530346334316537343465363862323630 | ||||||
| 37313661353764343764396666633666613238323638646233353138383638353938303933396431 | 65643461623230373539306364636366653233323164633561303662623961323963303532613563 | ||||||
| 65366564353533363039383838313562663561633434393833636365303561333534393930653630 | 62663533313461383561623262643461376433663261353735326134393162366137643437633537 | ||||||
| 63663464613334623864313663383630353166363862373132343532393135313666626464376436 | 37333963303231353866306439343235363965656531386630366632633530316163633766346165 | ||||||
| 34616566663764363566663530646638363338653538353661393835383035346236646233363564 | 31353564663731336536306630386434626337663838383761326136356264376336363466656562 | ||||||
| 34656165303737326261353032363435333731363031343366353863313138653865346535636564 | 63623331306135323939376430623536323564663534383337656239656330383837333362353239 | ||||||
| 31393134336534616161303132353764343833636465356661376638633163643739383830616534 | 64346536343464626533623665653837383834346264306433633833396238633239313766326137 | ||||||
| 65386262663734356134303039623265303935363764623537326565633030613465666435636232 | 62313466353935396231356364626430623237323430353039633264306463393161346333653766 | ||||||
| 61623334393734616262613232306339396639643636373762653738333463616361653430656438 | 61323534313366333931656132373636313539616434353234386439633334623662616439343336 | ||||||
| 63316265303634323033303330353232636136333863366261656532383065313334386335666636 | 61653736353165393931616237303631393465303964663066336665333337373635363836376335 | ||||||
| 34303564636333356364663565333932343064333266383638663365366636643866353132373966 | 31626430313566333937653165656266393535386362356163666664303434663964343933613733 | ||||||
| 66336563346233656531643735663062393630616537656264323136353266623161353261333239 | 65643436613935396230613861333330333162336166656263383937373666336666356661333839 | ||||||
| 33636563376566333331366336353338343730383962653138636535623039643461303763333961 | 64663134666234386433376231333039373361363930373435353039363930363263653838306337 | ||||||
| 63373264333037653563643937373664373665343136396635316634613632653232353033666266 | 32333361383830623564663935643061336161396638386536383261363932383564633633306233 | ||||||
| 31333064623765326536386630353435333438326232633565663531303730636530386564366633 | 36356264633138343330396333333161323065613764393166643830356130306663303161336439 | ||||||
| 63326335333639376266396562343838636430643664303737373565363635643037616231393665 | 65363530613635613838393238326663633539666563353033396637326166613730333937633934 | ||||||
| 36636337633564373561343266666632656235646662633965663733383731633832373334646335 | 64653031346635353437373239326566643439623532643365373562656234653634663364326333 | ||||||
| 34396163636635633637393834396566663062633135383330396564656536333330623737636332 | 34376439656164393664363536343065356136343065366630346165346564396266623331353131 | ||||||
| 36646362623131366166626639386238616566323135323334636638393934663336663532306336 | 62363334323836353366636262613362613735613838383531383337666562386363353830386665 | ||||||
| 38396634393433623963316261303061616634333566306239366666373238376466633166623464 | 63363966336230663063666463326639313863656262666235343861646662363633663731646139 | ||||||
| 33313538663838373465626638316432613135386262376233633362616463623363646433353666 | 62653666613963343338616233373738326464383339376637333335363065336561326538343734 | ||||||
| 32633838303837656335333336353564343461373236353736623032663139333338646463323533 | 35333334373366383533646434313730666335366333356131643862643031346638383931376438 | ||||||
| 65326131616433666563343163663462393235366135633661366564623662303932626164366632 | 35653164313133333361623333666532393130303333376635393537313336373062306635393132 | ||||||
| 38306430356238633162656337303536663065653639353562343965663366373861646162653562 | 32393161303531346236666664323635366330323437386232323637323639636263343561616536 | ||||||
| 62306236326163393336643232663336656637623539353835613536653164393038623966316433 | 35336333616231646365613064396263333665336232333361303166656366363566383237623566 | ||||||
| 32623462343037616465623736306530633736623061343430356638633530313331306363323837 | 38623833343235623239313663653831353032636635656562616534383730346338626161653036 | ||||||
| 63396263393136363137643632623938316363386238346237333862303735363065386633366263 | 64366463386436373231353864656366666365313435386166613535363130626563626435303032 | ||||||
| 31313834646239323631393335633534383930373630663538653864383930666465653731616263 | 66383561393834646666363661363963363433666565323366653230363737353463313233653762 | ||||||
| 35333830633430343436646266663231303466343138643338343634346133613666613734313037 | 30666665333464396531373265663431383035366437653232376533323965333662376663613534 | ||||||
| 34383931643631633539346262653631336565623366343564303332333831346436373162356362 | 31636130386364333833666465363866333564343836323964663366616462646335626262323565 | ||||||
| 66383864313732303962653662333036373239343335623765616536306465623030393138663838 | 37303366386662626430313633363337333032316532323532316439333331653831396164623762 | ||||||
| 30313861636631393462653836626164373034666533323338383262393132396436666639363262 | 63353531343662636633626134323537633038393234376531333735313337383263393332383364 | ||||||
| 39356132343939366534666665393231346566663432653236376333323363643166393431316161 | 31643363623730623335343839353463393939316334656636306466633064376661303062313435 | ||||||
| 33343666316138353333346263346266343731613065356631336231373266343338393939663038 | 30333238303461373936633831303961316435643130663735623937613262373630326366633664 | ||||||
| 35343235393563623434313266306163323266346662623063353631663433646436613130636663 | 63653463666665356565653332666436666262623535353434633064376362636235356563363961 | ||||||
| 38356335616438633638383236333131663163613436303934386335363432323063303234383331 | 31653439363539643139663864353039306235663762393761383965623333386238633534633562 | ||||||
| 34636432653262643438653931313233626462623034346137303738643932353334373531303439 | 34616231306138616263626235323635343365303564666134373034656561633230346235356238 | ||||||
| 30366233373535343431373365393566383538363763313036623262343066346236303061326631 | 33376434613631303665323730643238336133343363393161336634333037343863326139636639 | ||||||
| 64376463336538363132656464666365343861393330313637356237666361343666633436346534 | 32346234666366653237373430666566313932323161333031663366643362383365646439313336 | ||||||
| 33636332386336646333616330613738343264626438613135313962336534373130316330366233 | 61623665633135663136626363356136383663663662386534346265616662633539383961656531 | ||||||
| 30316333636564326165663565666361643430656366393939616538323530383632636661326331 | 61633038366661623432396632383735303533663239623462313062353665613339333465626162 | ||||||
| 35366663646533313034333764626237623637363164356163636432653765656439326438383134 | 38393165316538353237386333636632313862366465653735313265616635353164373661303062 | ||||||
| 62623638633934336334393636333336633164343066336161333138653637333435306230653865 | 39376234633232313264653565316532393435373439306635353330616130343735393832396163 | ||||||
| 35363032393633623331363933373463623032333361616365373037666333643634343963663835 | 32323333656333633236323337356164636634633461373237633439633662353939323062626461 | ||||||
| 34363033363731346663643363383965336536353332646262326136353965353137383737336165 | 65343062346466386463333832353431383537373432393461353764333636616138616263386663 | ||||||
| 33613733656463376333376264633935373239363337323538356636636439393564373332323031 | 65373137306130653061663330386436383330633534633236623633643862313137646133643230 | ||||||
| 31623733663530326632373235313830396133373430613061613438653336653462316336623438 | 30343264393936366461646165383466356163356330386363643962636337343065353365663837 | ||||||
| 30343032346133363830656231663966653734326635333831626639393666303033653437326238 | 33393635643638356163386665616232363161333132343764306139663736626361626333646366 | ||||||
| 65333566643066393331323466366662383135383734313537663664376161323265613436653535 | 61656337346161343134333336316337353062386633643732343433623062386432343436316337 | ||||||
| 63643832616663303632623433636161333339376635333635626137326662396562633830343337 | 33633263353534383362623966623065393966383366613238323538316430343734663663356333 | ||||||
| 65376165376564396433343736313134656332383533356138383039386266636238613936653962 | 6235 | ||||||
| 32373337346335383136303838343034376432363436356465613836366230313463303239373531 |  | ||||||
| 65383334646431346565656638353537333765623430333133663663326134646566306137643663 |  | ||||||
| 65643338386439666636376461356466396261326165333030623633613364343631343830653939 |  | ||||||
| 64323266626131666332666433386434313936306361633164373532626231366234623735333932 |  | ||||||
| 62306362346164336433336139313561366162303666353635653634396139313734626463663735 |  | ||||||
| 38306466626237626634666138363665326636316563356431333432313534363638613833613539 |  | ||||||
| 38306237353764376462323238663034646662393433623830616361623735343162666465626230 |  | ||||||
| 30633731323939633265323338373537383261333235303262633336636433316339383433653861 |  | ||||||
| 3861653261646632636364623830626561393864666135346634 |  | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -3,12 +3,14 @@ | |||||||
|   <option name="family" value="inet6" /> |   <option name="family" value="inet6" /> | ||||||
|   <short>abusers-ipv6</short> |   <short>abusers-ipv6</short> | ||||||
|   <description>A list of abusive IPv6 addresses.</description> |   <description>A list of abusive IPv6 addresses.</description> | ||||||
|   <entry>2001:41d0:1:f934::1</entry> |   <entry>2001:41d0:1:c2cc::1</entry> | ||||||
|   <entry>2001:41d0:602:238d::</entry> |   <entry>2402:1f00:8001:bdd::</entry> | ||||||
|   <entry>2001:41d0:a:2a31::</entry> |   <entry>2604:a880:cad:d0::169:3001</entry> | ||||||
|   <entry>2400:6180:0:d1::476:7001</entry> |   <entry>2607:5300:60:8102::</entry> | ||||||
|   <entry>2402:1f00:8001:8bd::</entry> |   <entry>2607:f298:5:103f::d99:2ae3</entry> | ||||||
|   <entry>2604:a880:800:10::5bf:2001</entry> |   <entry>2607:f298:5:110b::3f:109c</entry> | ||||||
|   <entry>2a00:d680:20:50::bcb2</entry> |   <entry>2607:f298:5:110b::9e2:d4bd</entry> | ||||||
|   <entry>2a02:2168:a01:33ee::1</entry> |   <entry>2607:f298:5:110b::ee9:ac74</entry> | ||||||
|  |   <entry>2a03:b0c0:3:e0::292:9001</entry> | ||||||
|  |   <entry>2a0a:5e80::d8b3:c78f:14f7:1</entry> | ||||||
| </ipset> | </ipset> | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ | |||||||
|   when: ansible_architecture != 'armv7l' |   when: ansible_architecture != 'armv7l' | ||||||
|  |  | ||||||
| - name: Add GPG key for Tarsnap | - name: Add GPG key for Tarsnap | ||||||
|   apt_key: id=0xFC72A10BF6B692AA url=https://pkg.tarsnap.com/tarsnap-deb-packaging-key.asc state=present |   apt_key: id=0xBF75EEAB040E447C url=https://pkg.tarsnap.com/tarsnap-deb-packaging-key.asc state=present | ||||||
|   register: add_tarsnap_apt_key |   register: add_tarsnap_apt_key | ||||||
|  |  | ||||||
| - name: Update apt cache | - name: Update apt cache | ||||||
|   | |||||||
| @@ -34,10 +34,8 @@ | |||||||
| - name: Update MariaDB root password for all root accounts | - name: Update MariaDB root password for all root accounts | ||||||
|   mysql_user: name=root host={{ item }} password={{ mariadb_root_password }} login_unix_socket={{ mariadb_login_unix_socket }} |   mysql_user: name=root host={{ item }} password={{ mariadb_root_password }} login_unix_socket={{ mariadb_login_unix_socket }} | ||||||
|   loop: |   loop: | ||||||
|     - "{{ inventory_hostname }}" |  | ||||||
|     - 127.0.0.1 |     - 127.0.0.1 | ||||||
|     - ::1 |     - ::1 | ||||||
|     - localhost |  | ||||||
|   tags: mariadb |   tags: mariadb | ||||||
|  |  | ||||||
| - name: Create .my.conf file with root credentials | - name: Create .my.conf file with root credentials | ||||||
|   | |||||||
| @@ -20,18 +20,25 @@ nginx_ssl_protocols: 'TLSv1.2 TLSv1.3' | |||||||
| # See: https://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_stapling | # See: https://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_stapling | ||||||
| nginx_ssl_stapling_resolver: '1.1.1.1 1.0.0.1 [2606:4700:4700::1111] [2606:4700:4700::1001]' | nginx_ssl_stapling_resolver: '1.1.1.1 1.0.0.1 [2606:4700:4700::1111] [2606:4700:4700::1001]' | ||||||
|  |  | ||||||
| # install certbot + dependencies? | # HTTP Strict-Transport-Security header, recommended by Google to be ~1 year | ||||||
|  | # in seconds, see: https://hstspreload.org/ | ||||||
|  | nginx_hsts_max_age: 31536000 | ||||||
|  |  | ||||||
|  | # install acme.sh? | ||||||
| # True unless you're in development and using "localhost" + snakeoil certs | # True unless you're in development and using "localhost" + snakeoil certs | ||||||
| use_letsencrypt: True | use_letsencrypt: True | ||||||
|  |  | ||||||
| # Directory root for Let's Encrypt certs | # Directory root for Let's Encrypt certs | ||||||
| letsencrypt_root: /etc/letsencrypt/live | letsencrypt_root: /etc/ssl | ||||||
|  |  | ||||||
| # Location of Let's Encrypt's certbot script | # Location where to save initial acme.sh script. After installation the script | ||||||
| letsencrypt_certbot_dest: /opt/certbot-auto | # will automatically create its home in the /root/.acme.sh directory (including | ||||||
|  | # a copy of the script itself). | ||||||
|  | letsencrypt_acme_script: /root/acme.sh | ||||||
|  | letsencrypt_acme_home: /root/.acme.sh | ||||||
|  |  | ||||||
| # stable is 1.18.x | # stable is 1.20.x | ||||||
| # mainline is 1.19.x | # mainline is 1.21.x | ||||||
| nginx_version: mainline | nginx_version: mainline | ||||||
|  |  | ||||||
| # vim: set ts=2 sw=2: | # vim: set ts=2 sw=2: | ||||||
|   | |||||||
| @@ -15,3 +15,6 @@ add_header X-XSS-Protection "1; mode=block" always; | |||||||
| # CSP can be quite difficult to configure, and cause real issues if you get it wrong | # CSP can be quite difficult to configure, and cause real issues if you get it wrong | ||||||
| # There is website that helps you generate a policy here http://cspisawesome.com/ | # There is website that helps you generate a policy here http://cspisawesome.com/ | ||||||
| # add_header Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' https://www.google-analytics.com;" always; | # add_header Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' https://www.google-analytics.com;" always; | ||||||
|  |  | ||||||
|  | # Opt this site out of Google Chrome's Federated Learning of Cohorts (FLoC) | ||||||
|  | add_header Permissions-Policy interest-cohort=() always; | ||||||
|   | |||||||
| @@ -1,3 +0,0 @@ | |||||||
| #!/usr/bin/env bash |  | ||||||
|  |  | ||||||
| /bin/systemctl start nginx |  | ||||||
| @@ -1,3 +0,0 @@ | |||||||
| #!/usr/bin/env bash |  | ||||||
|  |  | ||||||
| /bin/systemctl stop nginx |  | ||||||
| @@ -1,135 +1,57 @@ | |||||||
| --- | --- | ||||||
|  |  | ||||||
|  | # Use acme.sh instead of certbot because they only support installation via | ||||||
|  | # snap now. | ||||||
| - block: | - block: | ||||||
|  |   - name: Remove certbot | ||||||
|  |     apt: | ||||||
|  |       name: certbot | ||||||
|  |       state: absent | ||||||
|  |  | ||||||
|  |   - name: Remove old certbot post and pre hooks for nginx | ||||||
|  |     file: | ||||||
|  |       dest: "{{ item }}" | ||||||
|  |       state: absent | ||||||
|  |     with_items: | ||||||
|  |       - /etc/letsencrypt/renewal-hooks/pre/stop-nginx.sh | ||||||
|  |       - /etc/letsencrypt/renewal-hooks/post/start-nginx.sh | ||||||
|  |  | ||||||
|  |   - name: Download acme.sh | ||||||
|  |     get_url: | ||||||
|  |       url: https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | ||||||
|  |       dest: "{{ letsencrypt_acme_script }}" | ||||||
|  |  | ||||||
|  |   - name: Prepare Let's Encrypt well-known directory | ||||||
|  |     file: | ||||||
|  |       state: directory | ||||||
|  |       path: /var/lib/letsencrypt/.well-known | ||||||
|  |       owner: root | ||||||
|  |       group: nginx | ||||||
|  |       mode: g+s | ||||||
|  |  | ||||||
|   - name: Copy systemd service to renew Let's Encrypt certs |   - name: Copy systemd service to renew Let's Encrypt certs | ||||||
|     template: src=renew-letsencrypt.service.j2 dest=/etc/systemd/system/renew-letsencrypt.service mode=0644 owner=root group=root |     template: | ||||||
|  |       src: renew-letsencrypt.service.j2 | ||||||
|  |       dest: /etc/systemd/system/renew-letsencrypt.service | ||||||
|  |       mode: 0644 | ||||||
|  |       owner: root | ||||||
|  |       group: root | ||||||
|  |  | ||||||
|   - name: Copy systemd timer to renew Let's Encrypt certs |   - name: Copy systemd timer to renew Let's Encrypt certs | ||||||
|     copy: src=renew-letsencrypt.timer dest=/etc/systemd/system/renew-letsencrypt.timer mode=0644 owner=root group=root |     copy: | ||||||
|  |       src: renew-letsencrypt.timer | ||||||
|  |       dest: /etc/systemd/system/renew-letsencrypt.timer | ||||||
|  |       mode: 0644 | ||||||
|  |       owner: root | ||||||
|  |       group: root | ||||||
|  |  | ||||||
|   # always issues daemon-reload just in case the server/timer changed |   # always issues daemon-reload just in case the service/timer changed | ||||||
|   - name: Start and enable systemd timer to renew Let's Encrypt certs |   - name: Start and enable systemd timer to renew Let's Encrypt certs | ||||||
|     systemd: name=renew-letsencrypt.timer state=started enabled=yes daemon_reload=yes |     systemd: | ||||||
|  |       name: renew-letsencrypt.timer | ||||||
|   - name: Download certbot |       state: started | ||||||
|     get_url: dest={{ letsencrypt_certbot_dest }} url=https://dl.eff.org/certbot-auto mode=700 |       enabled: yes | ||||||
|  |       daemon_reload: yes | ||||||
|   # Dependencies certbot checks for on its first run. I set them in a fact so that |  | ||||||
|   # I can pass the list directly to the apt module to install in one transaction. |  | ||||||
|   - name: Set certbot dependencies (Debian 10) |  | ||||||
|     when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version('10', '==') |  | ||||||
|     set_fact: |  | ||||||
|       certbot_dependencies: |  | ||||||
|         - augeas-lenses |  | ||||||
|         - binutils |  | ||||||
|         - binutils-common |  | ||||||
|         - binutils-x86-64-linux-gnu |  | ||||||
|         - cpp |  | ||||||
|         - cpp-8 |  | ||||||
|         - gcc |  | ||||||
|         - gcc-8 |  | ||||||
|         - libasan5 |  | ||||||
|         - libatomic1 |  | ||||||
|         - libaugeas0 |  | ||||||
|         - libbinutils |  | ||||||
|         - libc-dev-bin |  | ||||||
|         - libc6-dev |  | ||||||
|         - libcc1-0 |  | ||||||
|         - libexpat1-dev |  | ||||||
|         - libffi-dev |  | ||||||
|         - libgcc-8-dev |  | ||||||
|         - libgomp1 |  | ||||||
|         - libisl19 |  | ||||||
|         - libitm1 |  | ||||||
|         - liblsan0 |  | ||||||
|         - libmpc3 |  | ||||||
|         - libmpfr6 |  | ||||||
|         - libmpx2 |  | ||||||
|         - libpython-dev |  | ||||||
|         - libpython2-dev |  | ||||||
|         - libpython2.7 |  | ||||||
|         - libpython2.7-dev |  | ||||||
|         - libquadmath0 |  | ||||||
|         - libssl-dev |  | ||||||
|         - libtsan0 |  | ||||||
|         - libubsan1 |  | ||||||
|         - linux-libc-dev |  | ||||||
|         - python-dev |  | ||||||
|         - python-pip-whl |  | ||||||
|         - python-pkg-resources |  | ||||||
|         - python-virtualenv |  | ||||||
|         - python2-dev |  | ||||||
|         - python2.7-dev |  | ||||||
|         - python3-distutils |  | ||||||
|         - python3-lib2to3 |  | ||||||
|         - python3-virtualenv |  | ||||||
|         - virtualenv |  | ||||||
|  |  | ||||||
|   # Dependencies certbot checks for on its first run. I set them in a fact so that |  | ||||||
|   # I can pass the list directly to the apt module to install in one transaction. |  | ||||||
|   - name: Set certbot dependencies (Ubuntu 18.04) |  | ||||||
|     when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '==') |  | ||||||
|     set_fact: |  | ||||||
|       certbot_dependencies: |  | ||||||
|         - augeas-lenses |  | ||||||
|         - binutils |  | ||||||
|         - binutils-common |  | ||||||
|         - binutils-x86-64-linux-gnu |  | ||||||
|         - cpp |  | ||||||
|         - cpp-7 |  | ||||||
|         - gcc |  | ||||||
|         - gcc-7 |  | ||||||
|         - gcc-7-base |  | ||||||
|         - libasan4 |  | ||||||
|         - libatomic1 |  | ||||||
|         - libaugeas0 |  | ||||||
|         - libbinutils |  | ||||||
|         - libc-dev-bin |  | ||||||
|         - libc6-dev |  | ||||||
|         - libcc1-0 |  | ||||||
|         - libcilkrts5 |  | ||||||
|         - libexpat1-dev |  | ||||||
|         - libffi-dev |  | ||||||
|         - libgcc-7-dev |  | ||||||
|         - libgomp1 |  | ||||||
|         - libisl19 |  | ||||||
|         - libitm1 |  | ||||||
|         - liblsan0 |  | ||||||
|         - libmpc3 |  | ||||||
|         - libmpx2 |  | ||||||
|         - libpython-dev |  | ||||||
|         - libpython2.7 |  | ||||||
|         - libpython2.7-dev |  | ||||||
|         - libquadmath0 |  | ||||||
|         - libssl-dev |  | ||||||
|         - libtsan0 |  | ||||||
|         - libubsan0 |  | ||||||
|         - linux-libc-dev |  | ||||||
|         - python-dev |  | ||||||
|         - python-pip-whl |  | ||||||
|         - python-pkg-resources |  | ||||||
|         - python-virtualenv |  | ||||||
|         - python2.7-dev |  | ||||||
|         - python3-virtualenv |  | ||||||
|         - virtualenv |  | ||||||
|  |  | ||||||
|   - name: Install certbot dependencies |  | ||||||
|     apt: name={{ certbot_dependencies }} state=present update_cache=yes |  | ||||||
|  |  | ||||||
|   when: ansible_distribution != 'Ubuntu' and ansible_distribution_major_version is version('20.04', '!=') |  | ||||||
|   tags: letsencrypt |  | ||||||
|  |  | ||||||
| # On Ubuntu 20.04 it is no longer recommended/supported to use the standalone |  | ||||||
| # certbot-auto so I guess we need to use the one from the repositories. |  | ||||||
| - block: |  | ||||||
|   - name: Install certbot (Ubuntu 20.04) |  | ||||||
|     apt: name=certbot state=present update_cache=yes |  | ||||||
|  |  | ||||||
|   - name: Copy certbot post and pre hooks for nginx |  | ||||||
|     copy: src={{ item.src }} dest={{ item.dest }} owner=root group=root mode=0755 |  | ||||||
|     with_items: |  | ||||||
|       - { src: 'stop-nginx.sh', dest: '/etc/letsencrypt/renewal-hooks/pre/stop-nginx.sh' } |  | ||||||
|       - { src: 'start-nginx.sh', dest: '/etc/letsencrypt/renewal-hooks/post/start-nginx.sh' } |  | ||||||
|  |  | ||||||
|   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '==') |   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '==') | ||||||
|   tags: letsencrypt |   tags: letsencrypt | ||||||
|   | |||||||
| @@ -71,7 +71,7 @@ | |||||||
|  |  | ||||||
| - name: Configure Let's Encrypt | - name: Configure Let's Encrypt | ||||||
|   include_tasks: letsencrypt.yml |   include_tasks: letsencrypt.yml | ||||||
|   when: use_letsencrypt is defined and use_letsencrypt |   #when: use_letsencrypt is defined and use_letsencrypt | ||||||
|   tags: letsencrypt |   tags: letsencrypt | ||||||
|  |  | ||||||
| # vim: set ts=2 sw=2: | # vim: set ts=2 sw=2: | ||||||
|   | |||||||
| @@ -12,8 +12,11 @@ | |||||||
|     notify: |     notify: | ||||||
|       - reload nginx |       - reload nginx | ||||||
|  |  | ||||||
|   - name: Generate 2048-bit dhparam |   - name: Download 4096-bit RFC 7919 dhparams | ||||||
|     command: openssl dhparam -out dhparam.pem 2048 chdir=/etc/ssl/certs creates=dhparam.pem |     get_url: | ||||||
|  |       url: https://raw.githubusercontent.com/internetstandards/dhe_groups/master/ffdhe4096.pem | ||||||
|  |       checksum: sha256:64852d6890ff9e62eecd1ee89c72af9af244dfef5b853bcedea3dfd7aade22b3 | ||||||
|  |       dest: "{{ nginx_ssl_dhparam }}" | ||||||
|     notify: |     notify: | ||||||
|       - reload nginx |       - reload nginx | ||||||
|  |  | ||||||
|   | |||||||
| @@ -16,8 +16,8 @@ | |||||||
|  |  | ||||||
|     # concatenated key + cert |     # concatenated key + cert | ||||||
|     # See: http://nginx.org/en/docs/http/configuring_https_servers.html |     # See: http://nginx.org/en/docs/http/configuring_https_servers.html | ||||||
|     ssl_certificate {{ letsencrypt_root }}/{{ domain_name }}/fullchain.pem; |     ssl_certificate {{ letsencrypt_root }}/certs/{{ domain_name }}.fullchain.pem; | ||||||
|     ssl_certificate_key {{ letsencrypt_root }}/{{ domain_name }}/privkey.pem; |     ssl_certificate_key {{ letsencrypt_root }}/private/{{ domain_name }}.key.pem; | ||||||
|  |  | ||||||
|     {% endif %} |     {% endif %} | ||||||
|  |  | ||||||
| @@ -51,5 +51,5 @@ | |||||||
|     # Enable this if you want HSTS (recommended, but be careful) |     # Enable this if you want HSTS (recommended, but be careful) | ||||||
|     # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store |     # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store | ||||||
|     # See: https://hstspreload.appspot.com/ |     # See: https://hstspreload.appspot.com/ | ||||||
|     add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload" always; |     add_header Strict-Transport-Security "max-age={{ nginx_hsts_max_age }}; includeSubDomains; preload" always; | ||||||
|     {% endif %} |     {% endif %} | ||||||
|   | |||||||
| @@ -1,7 +1,9 @@ | |||||||
| [Unit] | [Unit] | ||||||
| Description=Renew Let's Encrypt certificates | Description=Renew Let's Encrypt certificates | ||||||
| ConditionFileIsExecutable={{ letsencrypt_certbot_dest }} | ConditionFileIsExecutable={{ letsencrypt_acme_home }}/acme.sh | ||||||
|  |  | ||||||
| [Service] | [Service] | ||||||
| Type=oneshot | Type=oneshot | ||||||
| ExecStart={{ letsencrypt_certbot_dest }} renew --standalone --pre-hook "/bin/systemctl stop nginx" --post-hook "/bin/systemctl start nginx" | ExecStart={{ letsencrypt_acme_home }}/acme.sh --cron --home {{ letsencrypt_acme_home }} --reloadcmd "/bin/systemctl reload nginx" -w /var/lib/letsencrypt | ||||||
|  |  | ||||||
|  | SuccessExitStatus=0 2 | ||||||
|   | |||||||
| @@ -14,6 +14,8 @@ server { | |||||||
|     listen [::]:80; |     listen [::]:80; | ||||||
|     server_name {{ domain_name }} {{ domain_aliases }}; |     server_name {{ domain_name }} {{ domain_aliases }}; | ||||||
|  |  | ||||||
|  |     {% include 'well-known.j2' %} | ||||||
|  |  | ||||||
|     # redirect http -> https |     # redirect http -> https | ||||||
|     location / { |     location / { | ||||||
|         # ? in rewrite makes sure nginx doesn't append query string again |         # ? in rewrite makes sure nginx doesn't append query string again | ||||||
| @@ -96,7 +98,7 @@ server { | |||||||
|         # Enable this if you want HSTS (recommended, but be careful) |         # Enable this if you want HSTS (recommended, but be careful) | ||||||
|         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store |         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store | ||||||
|         # See: https://hstspreload.appspot.com/ |         # See: https://hstspreload.appspot.com/ | ||||||
|         add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload" always; |         add_header Strict-Transport-Security "max-age={{ nginx_hsts_max_age }}; includeSubDomains; preload" always; | ||||||
|         {% endif %} |         {% endif %} | ||||||
|  |  | ||||||
|         include extra-security.conf; |         include extra-security.conf; | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								roles/nginx/templates/well-known.j2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								roles/nginx/templates/well-known.j2
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | |||||||
|  | location ^~ /.well-known/acme-challenge/ { | ||||||
|  |   allow all; | ||||||
|  |   root /var/lib/letsencrypt/; | ||||||
|  |   default_type "text/plain"; | ||||||
|  |   try_files $uri =404; | ||||||
|  | } | ||||||
| @@ -9,7 +9,7 @@ | |||||||
|         # Enable this if you want HSTS (recommended, but be careful) |         # Enable this if you want HSTS (recommended, but be careful) | ||||||
|         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store |         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store | ||||||
|         # See: https://hstspreload.appspot.com/ |         # See: https://hstspreload.appspot.com/ | ||||||
|         add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload" always; |         add_header Strict-Transport-Security "max-age={{ nginx_hsts_max_age }}; includeSubDomains; preload" always; | ||||||
|         {% endif %} |         {% endif %} | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @@ -20,7 +20,7 @@ | |||||||
|         # Enable this if you want HSTS (recommended, but be careful) |         # Enable this if you want HSTS (recommended, but be careful) | ||||||
|         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store |         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store | ||||||
|         # See: https://hstspreload.appspot.com/ |         # See: https://hstspreload.appspot.com/ | ||||||
|         add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload" always; |         add_header Strict-Transport-Security "max-age={{ nginx_hsts_max_age }}; includeSubDomains; preload" always; | ||||||
|         {% endif %} |         {% endif %} | ||||||
|     }    |     }    | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user