Compare commits

..

33 Commits

Author SHA1 Message Date
4846cbd968 roles/common: Add firewall task for Alpine 2021-02-13 12:18:58 +02:00
aa63f5946c roles/common: Add TODO about tarsnap on Alpine 2021-02-13 12:18:58 +02:00
53d574dd12 roles/common: Add Alpine packages 2021-02-13 12:18:58 +02:00
92c23bc2b5 roles/common: Use chrony for NTP on Alpine 2021-02-13 12:18:58 +02:00
e93b8af949 Add vars/Alpine.yml 2021-02-13 12:18:58 +02:00
dd04238a83 host_vars/web19: Add dev domain 2021-02-13 12:18:31 +02:00
efdbeb75ea host_vars/web19: WordPress 5.6.1 2021-02-13 11:48:21 +02:00
cd4411260c roles/common: Update list of abusive IP addresses
This comes from the AbuseIPDB with a confidence level of 95%. I use
the following command to download and sort the IPs:

  $ curl -G https://api.abuseipdb.com/api/v2/blacklist -d \
    confidenceMinimum=95 -H "Key: $ABUSEIPDB_API_KEY" \
    -H "Accept: text/plain" | sort | sed -e '/:/w /tmp/ipv6.txt' \
    -e '/:/d' > /tmp/ipv4.txt

I manually add the XML formatting to each file and run them through
tidy:

  $ tidy -xml -utf8 -m -iq -w 0 roles/common/files/abusers-ipv4.xml
  $ tidy -xml -utf8 -m -iq -w 0 roles/common/files/abusers-ipv6.xml
2021-02-07 15:56:33 +02:00
8cb232a765 Pipfile.lock: Run pipenv update 2021-02-07 15:53:10 +02:00
d4ca119265 Pipfile.lock: run pipenv update
Minor Ansible update
2021-01-27 11:06:12 +02:00
f72f8c7a8d host_vars/web19: Remove piwik nginx host 2021-01-06 09:07:41 +02:00
d7fa1697a1 host_vars/web19: Remove piwik database 2021-01-06 09:00:54 +02:00
b0420d2adb roles: Remove mentions of Piwik
I never check the damn analytics stats and the database is huge.
2021-01-06 09:00:18 +02:00
c70ebba151 Add host_vars/web20 2021-01-01 19:55:14 +02:00
ac860e72f2 roles/php-fpm: Only run PHP tasks if we need them 2021-01-01 19:54:12 +02:00
101c05d248 web.yml: Only run MariaDB role if it is needed
Not all web hosts need this. Some are static sites, for example.
2021-01-01 19:28:40 +02:00
1b75679496 roles/mariadb: The service is mariadb 2020-12-29 11:25:30 +02:00
ebf4a4c2ac roles/mariadb: Disable name lookups
Add skip-name-resolve=1 to disable lookups of hostnames to IPs. We
need to make sure all accounts are using IPs like 127.0.0.1 instead
of "localhost" now.
2020-12-29 11:19:01 +02:00
57a83cef26 roles/mariadb: Tweak temp table size
mysqltuner.pl said:

    When making adjustments, make tmp_table_size/max_heap_table_size equal
2020-12-29 11:10:31 +02:00
8ee52143fc roles/mariadb: Disable the query cache by default
It seems that the usefulness of the query cache is diminishing in
recent years. If your cache is large then the time taken to scan
the cache can be longer than the SQL query itself.

See: https://haydenjames.io/mysql-query-cache-size-performance/
2020-12-29 11:07:33 +02:00
67a18c4f49 roles/mariadb: Reduce key buffer size
mysqltuner.pl shows currently 6M out of 33M being used.
2020-12-29 10:58:12 +02:00
b8428e67a8 roles/mariadb: Install MariaDB 10.5 2020-12-29 10:41:27 +02:00
e18529e6e1 roles/mariadb: Update service name
As of MariaDB 10.5 the service name and binaries have changed from
mysql, mysqld, etc to mariadbd.

See: https://mariadb.com/kb/en/upgrading-from-mariadb-104-to-mariadb-105/
2020-12-29 10:40:13 +02:00
89db1449d1 roles/mariadb: Fetch signing key from mariadb.org
I downloaded the key and checked the fingerprint with gpg:

    $ gpg --dry-run --import mariadb_release_signing_key.asc
    gpg: key F1656F24C74CD1D8: 6 signatures not checked due to missing keys
    gpg: Total number processed: 1
2020-12-29 10:36:33 +02:00
6660a0cd36 roles/mariadb: Remove innodb_buffer_pool_instances
This was deprecated in MariaDB 10.5. The setting is now ignored and
will be removed in a future version.

See: https://mariadb.com/kb/en/changes-improvements-in-mariadb-105/#innodb-removed-or-deprecated-variables
2020-12-29 10:18:23 +02:00
e7d5cb1edb host_vars/web19: Override root for picturingjordan.com 2020-12-28 22:55:57 +02:00
73d6abd15f roles/nginx: Allow sites to override the root 2020-12-28 22:53:32 +02:00
e1b412bfff roles/common: Update list of abusive IP addresses
This comes from the AbuseIPDB with a confidence level of 95%. I use
the following command to download and sort the IPs:

  $ curl -G https://api.abuseipdb.com/api/v2/blacklist -d \
    confidenceMinimum=95 -H "Key: $ABUSEIPDB_API_KEY" \
    -H "Accept: text/plain" | sort | sed -e '/:/w /tmp/ipv6.txt' \
    -e '/:/d' > /tmp/ipv4.txt

I manually add the XML formatting to each file and run them through
tidy:

  $ tidy -xml -utf8 -m -iq -w 0 roles/common/files/abusers-ipv4.xml
  $ tidy -xml -utf8 -m -iq -w 0 roles/common/files/abusers-ipv6.xml
2020-12-23 09:01:08 +02:00
39994f118c host_vars/web19: WordPress 5.6 2020-12-22 15:44:01 +02:00
10b6b11be5 Pipfile.lock: Run pipenv update 2020-12-22 15:35:26 +02:00
d4fd06862a roles/nginx: Fix Let's Encrypt pre/post renewal hooks 2020-12-10 15:20:23 +02:00
d553f80a00 Run pipenv update 2020-12-09 22:47:44 +02:00
b5921b6b34 host_vars/nomad02: Add drone.io deployment notes 2020-12-09 22:14:52 +02:00
22 changed files with 8084 additions and 7852 deletions

121
Pipfile.lock generated
View File

@ -18,17 +18,17 @@
"default": { "default": {
"ansible": { "ansible": {
"hashes": [ "hashes": [
"sha256:98e718aea82199be62db7731373d660627aa1e938d34446588f2f49c228638ee" "sha256:ae97002e4fb1ed3de947428ff43906c76c66751fe104721cf6b25fa115dbbe8d"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.10.4" "version": "==2.10.6"
}, },
"ansible-base": { "ansible-base": {
"hashes": [ "hashes": [
"sha256:35a208726b10fecbcf00c263ae4572b48f505b5796fb77a85c3e9c1036ea5e4f" "sha256:33ae323923b841f3d822f355380ce7c92610440362efeed67b4b39db41e555af"
], ],
"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.3" "version": "==2.10.5"
}, },
"cffi": { "cffi": {
"hashes": [ "hashes": [
@ -48,17 +48,20 @@
"sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009",
"sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03",
"sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b",
"sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e",
"sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909",
"sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53",
"sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35",
"sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26",
"sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b",
"sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01",
"sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb",
"sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293",
"sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd",
"sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d",
"sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3",
"sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d",
"sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e",
"sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca",
"sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d",
"sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775",
@ -71,39 +74,31 @@
}, },
"cryptography": { "cryptography": {
"hashes": [ "hashes": [
"sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538", "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d",
"sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f", "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7",
"sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77", "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901",
"sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b", "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c",
"sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33", "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244",
"sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e", "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6",
"sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb", "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5",
"sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e", "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e",
"sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7", "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c",
"sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297", "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0",
"sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d", "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812",
"sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7", "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a",
"sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b", "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030",
"sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7", "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"
"sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4",
"sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8",
"sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b",
"sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851",
"sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13",
"sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b",
"sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3",
"sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"
], ],
"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, 3.5'",
"version": "==3.2.1" "version": "==3.3.1"
}, },
"jinja2": { "jinja2": {
"hashes": [ "hashes": [
"sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419",
"sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"
], ],
"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.11.2" "version": "==2.11.3"
}, },
"markupsafe": { "markupsafe": {
"hashes": [ "hashes": [
@ -112,8 +107,12 @@
"sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235",
"sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5",
"sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42",
"sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f",
"sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39",
"sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff",
"sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b",
"sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014",
"sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f",
"sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1",
"sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e",
"sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183",
@ -122,35 +121,50 @@
"sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1",
"sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15",
"sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1",
"sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85",
"sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1",
"sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e",
"sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b",
"sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905",
"sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850",
"sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0",
"sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735",
"sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d",
"sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb",
"sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e",
"sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d",
"sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c",
"sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1",
"sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2",
"sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21",
"sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2",
"sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5",
"sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7",
"sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b",
"sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8",
"sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6",
"sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193",
"sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f",
"sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b",
"sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f",
"sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2",
"sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5",
"sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c",
"sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032",
"sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7",
"sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" "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 >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==1.1.1" "version": "==1.1.1"
}, },
"packaging": { "packaging": {
"hashes": [ "hashes": [
"sha256:05af3bb85d320377db281cf254ab050e1a7ebcbf5410685a9a407e18a1f81236", "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5",
"sha256:eb41423378682dadb7166144a4926e443093863024de508ca5c9737d6bc08376" "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"
], ],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==20.7" "version": "==20.9"
}, },
"pycparser": { "pycparser": {
"hashes": [ "hashes": [
@ -170,21 +184,30 @@
}, },
"pyyaml": { "pyyaml": {
"hashes": [ "hashes": [
"sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97", "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
"sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76", "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
"sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2", "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
"sha256:6034f55dab5fea9e53f436aa68fa3ace2634918e8b5994d82f3621c04ff5ed2e", "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
"sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648", "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
"sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf", "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
"sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f", "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
"sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2", "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
"sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee", "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
"sha256:ad9c67312c84def58f3c04504727ca879cb0013b2517c85a9a253f0cb6380c0a", "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
"sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d", "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
"sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c", "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
"sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a" "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
"sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
"sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
"sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
"sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
"sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
"sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
"sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
"sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"
], ],
"version": "==5.3.1" "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"
}, },
"six": { "six": {
"hashes": [ "hashes": [

View File

@ -1,34 +1,127 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
33393836306465346339656361353132336436343461633636376263326565333435373266323034 35356461313263333464373365643730653766393437316133336138313761343130646131363861
6666633230346633353630336637333235633032643939360a643365306265333736646463336632 3834623038366139376261326439633334393565346666650a323963393665366134386535316530
39623265613161356635306639343639643336626262386261306633356132333362323564353564 61316264343737383331663361353838656333623335393635393762303533313036373161393462
6566326335333463660a393933633630393130323666326433343963636139393433343531353837 6664616164633039360a613766323932323266613166646635376333626333356364316233633931
35633865303930343066303961353233643138366430313835636237373539396238643566353933 37646436383339343938356164646262363032663063393038616535346139633435623265343762
37613338303339373538383165326636306439373763393530626365376564326163363536383562 33663036393761643861386538336665366537626464373931386535666237636439383133393636
32376636316334313633393835613630383633366664643431323431353764303461343637303366 31383938376331313531366237336463323563323134313037393435333239613663663234376239
65636437656532636661376337643730613438636537353363623234353062333035653138636534 62346163663061316666636138353962383336623133333030396534323033626632343561386466
31353661393062376636356631363436306238316662663737636337373735383734633261393533 30356266313566316565626562376364643238386561323165633730383262343638326337636264
66383736303133666432653737653666393038643961366632643063333861636265616636366431 35636264386262363264633833653265393962373435653639363733636562343238363931663031
36313232323364633031333535346236666266303231653363316430643632323966653164383364 63666135613437366166643130623034616636616632633838653464666130383365326434666234
64313030643834323330313734636663366635313631336132396565356665653666346231616162 32643164353766323131343137373438613663646635326338303934613065653466613036323961
32346639663863366265643738626538636539326233386337646335343731653033636434393838 38353034636434663061353138393130316432366539643937623935643834633964653630326564
31633833646632333036383733626335366364373936386637623262323663343635626233663530 31636563336138623433366536663632313863313435333531353865623066656631343032383937
30316434636365376436393335353032323138376236316338353266643261663737353665386437 65313535303563653762646261396366333737306331643037366433323030303265613638616164
34616136653630333834346330643062663732306631303937363262653664356563613237316536 36336338333837393235326539303964323261393039393533643538623634613432643532333863
63383664323231363737396463666266383237373033653161663162636263396630633036363036 66376166336662306564323433356330336662333433633061313266323638396165656665663965
64393064636639393133383635303131376162386561633130346634343537616365346363656234 38376465383662626633396366326466333436333338373361363039306539396337333061643264
33386132666134353630356366656465646636353832613962616630313036346539383566666131 37356562623130373765366331643332376337353065366561656261353131666533636466386432
32383138316236386664623066646338666530656561316665613465303039386433616162393137 31643438633464356464333065316139626166326164616666363666393562356239343637333030
62343131333463616632383031363439623961663739376661623739343364323931616433396234 39366231316462663265346464613333306336316163643131303235616432613565613733333466
34383530616338356134366438366365333837623433343637373761343234333265633961393164 33343036326435643736336465303861643739663536343965346433363231323065643733336634
33613764303535376237613135313437316563396639613361393531346133613938326464376335 63646133633037613964393935373161666161383862616333376638616336616537616363643661
65636431323632643163623830626333646430393235343731396339366530316134343736316337 36326665316332303537663935633431626533323838393638653661343665306332396130393866
37383665653664653165633363626531376637386661326434633939613638623538336234363938 66303231666533393132396538393963626132643366373539656437386663653261323465613366
37623931346438633731306263646538333530316666383064336462363632356631373166656236 39633964366362353866326562313834313266656265363161316261386638623737393034663665
32616661376264396336616666626636303734646534326439316663386433636661323034336536 66303966623830366431316432323863386332383362396534396166343238616534346335323761
61386632666162633633356335626362663531333163663532326163633336366535303134363835 31366164623465643331323330323736336337653230623362626230623365636364633261653765
34386565633761326364383663316465623732636463336634613236616564656634626165636561 38613566626537386134373133376139623062383736356634393739353665326164343131323833
39386333616134626430633332353137393739626530633731323363333032386436336432643838 31313038363663316636356431613032636131303964373564633462303735323364636131373033
32613133346134613636383163636435386432633530313931653065376666353238666134323035 30623336306663346639326638303930383466323938356163633964623565313261363139303238
62393463333462393432373635386466666536643432646164633239306331653539393466333836 31326666363164376261393062616339643039316163346362633865356433346636323664656262
34623836393464396264373763626461376438613036316138346466363563613664 65323565346137333338363864346437373261383936626531316330316539653339303464623462
32616635373631323465646632323732323432316332353033656339366639663732313939303733
37306130656662383237613361326161313039326561396538396333373362633365353130343963
35613833616635353266636265313766323635303764346236306664346432366632376132333034
65303235366137356634666138343232366533613966363030376537386162396638656637663932
66663939393737313634383430323339663634333533653265656163326637636635386163313333
38666236626131333139633834373534316638303364666135396361616130303061313431643936
64666134623666363937356334356134306463386466613365363136663136393833616430623836
65373663363664333766373136336636393663376535623532626632396665366436623661636665
62333961383034353664323333353766343939666636616539653236646634313333373639643765
32353161633665306463386633616131333130303139306134646134663865306463353838323565
39313538393034323065333031386634396261336131333763393466633335666238373663623564
38316633663536383730376532633830623939633662346636356632653031633335313732666663
33613133653666313564626261353730373637396137323964363866653964373838613130643337
32376165356236663332366566626639313038363138343061306438313435613862626564613830
61306262613262366539663338643962313066613665353063306537643561666462333763623866
30643230313334646535336662616137326437323438336361376562663361376230316362323235
65363630666464323638323761343033313763633866623361376636653631396263626239613764
64656163343435643838353033316364306134663833616231343831613338653330643466643630
62323039396231366136353432373732613465336163326132353731313765356163323866633736
35326665613165373339353165613036646665313065343432663563306664323163306535613338
31663138333639666133323139326339313733663334336637373866636661636538666630346233
31393364313433626565616661313265336165613534666232333835383963646433316632303533
62626134623830363533393833633439313034633965346163393932636464326664653335643833
35386332663736343766656232313031306534653434363164623530613232306531336561373534
37333763626135373538313561303737623035653832333533663534313035313530373037616634
30613937626664373333643735633164663930316235336663376132353338356333623431343535
37623138363937646665626535303463643330333233363136313134383939343535646539346363
61633966396234393961663735646634373266373264626635306162386632376262646336316266
36363166393332626533613736353038656266323263333036303964656662663436616532396665
64366638386164313466313630663138333066653061666362336661336539653339616234646538
30316334346162363065313438663865346434313564363863613532313637313430653439333962
34643039383030623564666230623264303338343564643961653531366463623166333661653630
38613062626464663963626233663837653533626532653239343065383036663162646261386535
36356231383263396365653639613664346361643666336463623136616330336161373336643535
36613530396266633861643530633732333436373966613437343736653537333531663466383438
64323064356262646133363463316639353630653766663731653030616461393139396265343033
31336662366465633264643065386432376435346236323565326562663161396435373762613839
36316365633937636330643837646335613262363734396261313633373731363466356632636532
37653036336665393733343832363739323739383730306635306666333566366663396230623433
64663338626239313265623838383933653539666666383633623939343461393036303230663562
35363232636635613739356536386439326537363965626261363962383231386532623565343662
61633931613131303836356366653030656333623235663266636535666632353666386666386630
36303134613262663335623330356639383432353133333137363665633565363037333136653933
64396230613837396435333835343265633638346232303738663764663032343061346539393135
63303064366130333030663739326331633762386332333162393631346234306363313737663261
31303437376339353634393438316139663862333530653339393030633932343765326435303530
30326566336361646563313433663063396338663661353832666561393437306131336465343332
63316533623362613062626337306530633833323132616662613366653566396136643936653435
33323938333666333439653037383335353763386132643362643361386232383964366237326538
32343061643462343265383234366465366232666434623634383132303138643333343663613039
65663339663030326364663561383833333432633437313232356265396532303735316234353565
39313532306437333238373064643238666632383166313832326662663762316165323936623239
62366239393530366666343866376566623863373333666266316334346138396566613263333539
38373438653663353537323961373434363735303838306262323330616538636333306366373663
62666462336331623761363036353331356632643664373665656332663530613931376666353261
64346531363265316439393633346334383439623338653334343739353464316436626635653139
39633232626463303463646162633131626538353232646663356335363663613234376338623539
30303765636635633331326337373334626664343063623130393438633863306531653631323763
63323661356362346536646430623864306135663766313833366165653066343439663064336331
33353135383830373831623463646461616665326139623565666464363961306461343361343665
30633331666533383161623130613963376266613533366334393262313730313630323836623162
33613637363431306632366230336537373732613337613830666635353632383834383465303261
39633334616561386163353661306564333632653731363434666562353561363462376563626563
63353666653637336666376138333966643237633434396561386164623435333836653238383261
30643331373138313062616532366265313831613938373865336435383564636266663462636461
63663230626532613130623566376437356337653564303033393737663735316130633234643163
30373264363331366435383837303762363531333335613738613463336139643333626239346232
31393631663861623330353536313731353332313135363436643161353435653865313666373639
37313734306461633338363033623535653066633135666463303261383366333266613830623138
37303963666139306632666537633137326434366231333435323335623130356332313165353733
37656238613138396635303765376666303631633034306133393639363662313066653062373638
63313961343932393964643538663863313664616164363264663438393639306161373539653265
34346535373939316563353437663066656439353161623337343935396463363231636262656565
61653766616238393030333837616631373736323837363136623337623539336661633533653663
37376530303630313861376261323231303464653666323237373466353037313230333861373366
61323964636235373030343462326166323533343266353236653138326639363664633066346239
66636439373262646536333134306363313531333437316536656337633764356339633933336131
64366565323438343864666462356232616263623530613631303265313861383135333562343263
39633938313435313266386538346132336638303938373964616535313035653063636435643538
31636134393930363635613733343538326637366661623833396531623832616238323637633866
35666266656465323830356432653839633763643430363431326632393664656464363238363364
64356132326561376330316434393765663661356466346463366538323439393531343632316134
65313436623664613230616562323138343831623033643338363839343837303334346361356433
63356163626432343733336531366333636466613863613438373662643266636134633934326432
31386634363161653965303230306336373434613232613237343836353061613533616237666462
35393935383431323764646465636563363633336463353064346631363531383061333135386161
64363366303262336464646232316231613332333732373932643562626534666634316565343164
39336436366163326137396236393034363162366634616233376465303063663330386137343733
65393231343634316365326663666532646162623633373530393563313861653638353932396137
38666161336432303666316263396538663665353334376637343762613262303062313932363831
65346637366163333233633562393535306263666330666636613363383939393035643132326162
35656130366237363136643938633931363731623662343536623136313436616265333138646239
3765356139356136346264386137316437303865646335643530

View File

@ -1,110 +1,111 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
64383838396265653365343861343362316562363865636230623564316562356366376264663036 66313066303030333063353236313063303262626561316535646263633936336534356437353265
6536303765333234613437363062623235666234353664310a393561343233306565383439633036 3432356362393665303438333166643066666164363861610a643434356531666366393936353233
33393562393163383739636432633535613131366639356166656138373633663836343062376431 37353036656435616361613164323038663364666464373964653337396465373061666533373938
6234633464663833310a353134333062623365653733353531636537353262616238343362643865 6536323936393135370a666134613830306533623365363933376631313534326265666634366235
36336430376563666431383538323735316433326432306631396435333635613532306164333966 36623637383636396437333735336238343434353733303764326237303033303562353237353165
65623731353239333764376663353439363137663134376565346664646461316566373366393262 31653866633363623764353533356262643239613531643039393335313731383038343638663830
61396138623561623334656132626437656237643434303638353662313331303937663662613063 36356139336363343437666230656366636132613531613339353962373435643563313734646135
62393032386462393231363761306539326134346632383336353938313237666433633666623964 61613330323938363063313430343738306536636233353963636665393132643162303562666531
38363932643237323836386563623536313264363862396266366236393465616564366661623763 61343365326634303730656133633632353936386431303631363731313730666132656334353731
38633266313333646539653233386663623137323035626662663732363264366661323666633430 33616537313230666462653165643535386134663166346262363535383365616431613838383863
39656231656463333034613236366464623234303563373162396663303132333832343764323633 65326163303966373938653033613238326634393166643630316230613065353437306237313933
36366530626265623138326461626333623063363632623531376264616164613532383338323838 65366131396266393236373162343866383565633030356465613461353131643562343630336566
34383133616665646465393462343865373363306634653764346337333434396262363361396635 30633534636634616666616462383136373830623137396366626639373230373834316563343464
37333666313437393361323131303336653365363838373464353566366137373463663463653232 38303333366166323238346237646165383633383264333431663530326462323432366332333630
33356662613462613731306438396233643565313662653633303964633131333564346530616338 62633132666439313034616465663861323064646564303963633565353734353665313138373636
62363937346234386264656433376333346162336666663364363966343636323731656439323066 34653639353333373737613238626535356333633833363737646330643163326131386364646365
35313863393261373661626438626438663231613961343661616638323735386366356233626531 64356435636635663737376239313236356361363061313731626230366336326535663866373231
65663836303562653062323435356230656636363837643130643865303032353131306463393930 37623262613135636538343934336262633662383266653238613965356639626339303437306633
61366332663862613065373439376666336432346231613564633366303733303062613538383830 38373837653737313465376231363637353561303937336138343465376638326163643065336462
37663232616430623530343830666361303032613734633634376236363530333931313534613763 61633236373737363633646135396565303835643336393763393933613964663435306336346636
38353036303061326434623836393631646531363664323135393961353136373139643431376637 38316231383363616533616437366362376664393135623765646330323161366134323263376466
30383536343361376435396361623634343034323138343634303934386162353639666531366238 31386332333565643764343863353039313466643962373736643533666562353766383862326134
30376464313463343034623362646232616637653936633232383236663565323462366365366634 31633366636365313231366337313334333130373833656135396262373136393135353039623739
63363239613630663166653033353964653566663734646639663639623065323836333630323936 63626463636237633963323739303961663632376330336236663134666461383965303861333835
66303062393032633632646333396235333738306563356439363535653865346131326333333333 38663337393930383834653936636365663966333033346562356331306430306338333761353762
38656435613939333734393662626264643962373162663365323266376232623164656163306532 38363733356262363161353135633836336363376232326261623264623338663230663838386330
66643865303335356264396361653764326330633935326431323666353237313530643930646663 35353762393839646338366365313763346339666433306532353530353261363838356639623436
62643964303938623762613432323936366333326333383839393538306631353963623335623231 62306437616630663039653862393466353933333763386163373035373335343834663439633039
33653334666638313137656437643364363631316162393562643631366534363637653262363366 34613463303436366631396462363866656533343063356265333539353038326637613063326164
62383561633161346236393563306361376534333030353331633131376438613731313535326138 62663833363165643436343538666565386561383335393964313839626237623031343564656632
36353137393066623435343738653565623238313436613730393434316530633938636233633237 35613534636437306463373466653431336562303132313462326233663561343837323331353035
32363531313637353964303735373864383130366332333061323964623030303466333561613335 33303336356237306464363564666136633230396635623066376564373737353335356432343231
35356232323035333064323630646166343566623165643661656330666134353137366431303036 66633735316466633039663338316566343739373664316335366462356237366139363731643366
39626639396433313032303239313537656261613932326233343030393430663664663764643566 33353039373665333232383235303932623435366638313465396333316565646134343463336330
33643832353234306163393465393036626337303261386434633765343731396631353036336565 65306334623631386364353364313638643930306265343363666366663164643435333834376439
65646566623337366230386136613563396665383733326533643333363232666662383430303763 64396434366362343733323366343232653930646565313762376436663965626562636238623066
35353632663138336331356434333332396630656337643630303933353434613064666432353864 63303236326362323966666630343136336563343564393833636465333832396666396638653661
32663566643264623765653039666634646665643264346539656463663239666565646564353233 61323561393563326437386462656266303830353730313839613136656331323938616631386235
39373161323765326263346137643938616561366464626439373563383363343430633665383134 30633730303838313038313263363363633136623861326662623366613461343133356261633030
66303239353461376538323933363239303134393438623864373835306234303466316430626231 34333732343037396131343764366535343639326333353036353038656533333339306363653435
36626465663663313739306530386138323634366432306531656432323665373063653131376662 39656166393265356338656631353065653630303237663761386332323530663966343864663438
32663161316237303865366431306134643566346564363766356466643163306134323133373037 65356365386131333236396234623537323062363539383061323832363563326435306465663234
62613433623162373135376230616265633764356335323366396338363631353239363839373339 66316638376436613265353662646264666138666165343763393330613765346163356138616633
35316563643665373864616465626138356564346266663362393730646531326565393362356532 66373338393163333435666236386239663735653135386532633135646539316665313036323763
37386434376139316135373866646333623561656364363033643735333164653234346335336335 38666464363432656534313263306266323066646133353765386463343264633131633936373036
37316132393837626462653030643430303239643338306461373431633934666137343136333735 31326138633131393962633861333036373537366163613562383033336333616130636435326331
62656163663962616130656465633366613938396163313234373830393439626632653662373963 66653766653065306164613335623933616135393335383438356337633239363131303237653566
36656539393632363937313233386432306465373031386333353130346636353861396535353431 62636263383236656136376237646363363234363232643636623333396531363461303538373662
35356330343034613735313032306139643665376637363036636135336332613231646536616337 36313537393238626337613964623731666261316366346666323261386661643035353164613637
62306332643564643766346530616132363937376365373939623863663337326163343731386433 32303061336363306335306431613263646266303038323739636662326465303961616339333461
33616639316334396431643139643032306665343463383534633665346366653333653530313130 65626263366333333562386461636231636438623966626136663932303035343531363234356663
31343233663437396635646631353738373361326236396161643238306364366433376631633734 37313661353764343764396666633666613238323638646233353138383638353938303933396431
36313266306235376532633435626666663331316362373134653635646162313564366132333234 65366564353533363039383838313562663561633434393833636365303561333534393930653630
39393634636162353334363636346535383934303337336165383530313232383939303133373531 63663464613334623864313663383630353166363862373132343532393135313666626464376436
63613232386437353333363161333864353237303730626136613263316263663834366331633530 34616566663764363566663530646638363338653538353661393835383035346236646233363564
33316339326537636539663061333334643465663965386430356635613863653731333830353335 34656165303737326261353032363435333731363031343366353863313138653865346535636564
61663334376134396535643965376665393533633735396430663733643165343463316633656636 31393134336534616161303132353764343833636465356661376638633163643739383830616534
35383931643562383866303066376133366435633932626166393138393435383166343035326632 65386262663734356134303039623265303935363764623537326565633030613465666435636232
61326337613963356537633237366566623731663539663235336336316163653535343831616632 61623334393734616262613232306339396639643636373762653738333463616361653430656438
64366463626338343931313136383661313661613034303333626661376134326266373261653763 63316265303634323033303330353232636136333863366261656532383065313334386335666636
66613838373731353862373563663833623066396331346335626461383666303838323233383032 34303564636333356364663565333932343064333266383638663365366636643866353132373966
36346663393665623365666130396164616534316335383436616463323939663636343435373133 66336563346233656531643735663062393630616537656264323136353266623161353261333239
30396131646365393233333666633537386461366334613235373134316334373262356233633539 33636563376566333331366336353338343730383962653138636535623039643461303763333961
62333363353864393930333333303938383537373036623438363435353138616263373637386161 63373264333037653563643937373664373665343136396635316634613632653232353033666266
37646334393862346162616431386661316465666161666362623434613166633033386635356465 31333064623765326536386630353435333438326232633565663531303730636530386564366633
31646262323036653334356531613162626636353632633835363665616432336436636530323835 63326335333639376266396562343838636430643664303737373565363635643037616231393665
31623230623336376237643731633736373037316536633539613063623337303664336330373330 36636337633564373561343266666632656235646662633965663733383731633832373334646335
31636463363936373931336365373437393739626361343331663836396437366566386233336262 34396163636635633637393834396566663062633135383330396564656536333330623737636332
65333139633436633730613264313735636635333864393830306364613965393963326439323364 36646362623131366166626639386238616566323135323334636638393934663336663532306336
37363939326438656637343766333939666432363763306332653163306265323861366233613839 38396634393433623963316261303061616634333566306239366666373238376466633166623464
66663938323866306339373432656331356664336134366335623532646465386533323536383230 33313538663838373465626638316432613135386262376233633362616463623363646433353666
63646265323261656135376535383364336464306261663030656337623466356365623834383335 32633838303837656335333336353564343461373236353736623032663139333338646463323533
64333131336466663364666164366333396230313861373336386566616464363038383734313537 65326131616433666563343163663462393235366135633661366564623662303932626164366632
65306631303366616132616263613864343537323163306130393737316530653936616635303733 38306430356238633162656337303536663065653639353562343965663366373861646162653562
32633536653431363565633236626535643861636231303732653739623031303732316437353230 62306236326163393336643232663336656637623539353835613536653164393038623966316433
39643539646262393136653162366565316634336637333636316533393564643930383130643830 32623462343037616465623736306530633736623061343430356638633530313331306363323837
31653535316363316161343662333364663338323134663933623234346134333535613837613434 63396263393136363137643632623938316363386238346237333862303735363065386633366263
36663166336262393839303736663434386665363837633662653966613338646266393334386164 31313834646239323631393335633534383930373630663538653864383930666465653731616263
36353065303132663039393336333639366262303964643063653139633930663833643964353164 35333830633430343436646266663231303466343138643338343634346133613666613734313037
32343263626462396638333633663639366434393932376230313135306262653139386466616531 34383931643631633539346262653631336565623366343564303332333831346436373162356362
38623337363831323231383435393261663632373331623037383934336663356534613830323434 66383864313732303962653662333036373239343335623765616536306465623030393138663838
33303330316465646634393662323838663738636432633131623965316564393161303734313266 30313861636631393462653836626164373034666533323338383262393132396436666639363262
33346637613134633136383833323031306563353561633562343838306164666233666165613431 39356132343939366534666665393231346566663432653236376333323363643166393431316161
36356164366364383433316166633637666437666634356161376166373731306230656233383037 33343666316138353333346263346266343731613065356631336231373266343338393939663038
65316135326632363530353532323963616463323730376138613561623330303932383663633965 35343235393563623434313266306163323266346662623063353631663433646436613130636663
65386439653431626139336539383532646330633538313432346133323633383234313030363230 38356335616438633638383236333131663163613436303934386335363432323063303234383331
63386162636132356666616438313337356139333034396430653934373363373064376139346237 34636432653262643438653931313233626462623034346137303738643932353334373531303439
36643263613838343162613433613736313835373064316637333931306337336433333066633562 30366233373535343431373365393566383538363763313036623262343066346236303061326631
32666231326163393561353035366639333033323437643230363131646132363064626334363533 64376463336538363132656464666365343861393330313637356237666361343666633436346534
35663861356663373535663466336539313637363034373765373039373032656230656437373862 33636332386336646333616330613738343264626438613135313962336534373130316330366233
38303334346531393963636632343732396465346263393861396637616565313462373038356561 30316333636564326165663565666361643430656366393939616538323530383632636661326331
63643763646535613762346635313763616165656139666537313764313738393463663331343936 35366663646533313034333764626237623637363164356163636432653765656439326438383134
65336465323938616362656232626331326263336666643939356133306333313138313963626435 62623638633934336334393636333336633164343066336161333138653637333435306230653865
38363539303538393639393263396637323864303334323665316431613166306233656534626637 35363032393633623331363933373463623032333361616365373037666333643634343963663835
32663931663164663731303235633530373565316461383163643433336632653836623130396436 34363033363731346663643363383965336536353332646262326136353965353137383737336165
35653635353266666238326533643835643230333538363765376533616230653862623437623630 33613733656463376333376264633935373239363337323538356636636439393564373332323031
32653831366532363237383333363830333661646163633938313132663933323064376136656265 31623733663530326632373235313830396133373430613061613438653336653462316336623438
33303437363538653039383839393966313630653938643161636565366237656631396531383333 30343032346133363830656231663966653734326635333831626639393666303033653437326238
62643735333561623733393435376463626166363535303931613963656232343239356434316365 65333566643066393331323466366662383135383734313537663664376161323265613436653535
30623831633062373939323438313332346665613033383531373165363331393235303832363461 63643832616663303632623433636161333339376635333635626137326662396562633830343337
31653634353133363331333066363739353465663136346335653734363836323432396431616334 65376165376564396433343736313134656332383533356138383039386266636238613936653962
35646134316637653265343139313136393134626439306165653938616139363631333735303239 32373337346335383136303838343034376432363436356465613836366230313463303239373531
64633464386565666465646639386264653766386233376663373138363732636264366231363039 65383334646431346565656638353537333765623430333133663663326134646566306137643663
66346132386163353966393137353062623633346163643563363836376539643934663039646664 65643338386439666636376461356466396261326165333030623633613364343631343830653939
61323364643363643731343834623561353135393663643566383866623433363436313234636232 64323266626131666332666433386434313936306361633164373532626231366234623735333932
64373037313930653533363535373565663564643833353436356133653563336130386335643065 62306362346164336433336139313561366162303666353635653634396139313734626463663735
64396662653536303631616664346665303734653838326164386665323631336330326137333933 38306466626237626634666138363665326636316563356431333432313534363638613833613539
64356264343237616262636437306637303233343761646632646234376537333535323936663965 38306237353764376462323238663034646662393433623830616361623735343162666465626230
3865 30633731323939633265323338373537383261333235303262633336636433316339383433653861
3861653261646632636364623830626561393864666135346634

49
host_vars/web20 Normal file
View File

@ -0,0 +1,49 @@
$ANSIBLE_VAULT;1.1;AES256
30313139316131383630353236343338323465653163323838616464396137656365393639613766
3733323562386139353933626339663039653437363037350a356263643762313634613736356363
30383534346664353030346233653163616330376562346164613731346566393330623165306234
3833306632616536650a386239363931326463663665346363313462646464646632643961343631
63393164366163353461633038653833623963363233396464663839653330386231303461636564
39613265343765323636373736646462333665303333373737633632346465343439386335623334
35333933363966623730643632313361356661303562393535646230626639363335623861323033
32356664663539343262336535623233326234356463373031356361633536366430346338393831
34666232373761643430356662653431646661646165663134633135663933616262393763356133
61323063383036313166643866303136656164386239326437303238623338306433633762303630
39396438396639666433376533333765313431383862383031333031616334656136643262636438
65626565333939616631336237633063396430376434626437313666646165333239376463383837
64656635343661353735666666306134653530303033326662613230663061613034383461326534
65306131326634643732326530336136623731663336656138383635383730653633373737386335
31316136643634613536366439393565633964643735333336613865366138396539663534646435
61626530353836366337643062366532323538326161633137353336626537633739393464646632
32343730356362393336313535303034363531373961616265623934393161306261663562653464
63336164366531636130343939353235343261316534613665316363346266396332633763346536
65633038366530356138373661306234316161343762343638366639653132333438613766343939
61316232386465643236326430396130333831666363313032623537383032646663396239663338
38313939306465353033663066633435626635353138336330336333616231363634653665386532
65326463663933343966356437353433313565316139366365323934643131346636323737626437
36343435643231366663323134656561666133303030383734316237386532396662366461646365
38303434363763363866383761386535383262323432333730323236353439653163613966333032
39306533333132373736313834326464643134393432303537643835336438393461663233333239
32333365663337653436303662393263366161326465663036373934373764363438656436666232
32326134393161656133613266633966396663353631616537363361396537623164373964636666
61613731306333303336316337343635316134363431646433333932633336363065393637343030
39366537656430663932616335323661316533643763643161613463646363656232346333303331
38363234333261653135316266313736366439343138666165366533353035613731633466396363
31663166336431653461663463383333623664356365396230353130386138363261356331663965
66636338336466366132633437396535643736333733633430373964343533366338666532346263
38353233303437663339616532636662373761393461666439663133373633653139613531393738
32383937373833323938356333343963306534633734393162363965356163643862643037636231
65366461663161353939633866323162613761663836626232346236343263386364303233313161
32313265366562313731656630393166336662616661313964666661616439343265383566383332
33386266366534383934363839636636316532613133636664323136373130363534333531613663
35333964626634643135663639373339626335643366333766386631363439393435626439636166
37616339313336656634393538323935383964343437646433636636383061366437386330643334
34383237353036396563643730373663383165623633326336313031326435623538376130393130
64636538663963303938623866626431313238646465633437333863363865666435636564323764
39303638663830656162393836366262663161633763656630663434386435643462353661353035
63336461333464363838313765653037393964633536636435666162346461633561386364333966
32623761373435366665363239626632646364323934383163346637356562653332373536343462
31323036356132373930656364393061306130353632623661663032343230633635336664376134
38363239396139333230346138386337313364353934396362373233376266383537346431653234
34323835306165613739383336303964656565373636343639303831386466623031396665343234
33373164663339653839

File diff suppressed because it is too large Load Diff

View File

@ -3,14 +3,12 @@
<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:602:238d::</entry> <entry>2001:41d0:602:238d::</entry>
<entry>2001:41d0:8:9924::1</entry> <entry>2001:41d0:a:2a31::</entry>
<entry>2001:41d0:a:4284::</entry> <entry>2400:6180:0:d1::476:7001</entry>
<entry>2402:1f00:8001:8bd::</entry> <entry>2402:1f00:8001:8bd::</entry>
<entry>240e:f7:4f01:c::3</entry> <entry>2604:a880:800:10::5bf:2001</entry>
<entry>2604:a880:800:10::b5:d001</entry> <entry>2a00:d680:20:50::bcb2</entry>
<entry>2a00:d680:30:50::67</entry> <entry>2a02:2168:a01:33ee::1</entry>
<entry>2a03:b0c0:3:d0::d4d:b001</entry>
<entry>2a03:b0c0:3:e0::33c:b001</entry>
<entry>2a03:b0c0:3:f0::1aa:8000</entry>
</ipset> </ipset>

View File

@ -0,0 +1,15 @@
---
# TODO: configure awall (ipsets?)
# TODO: configure fail2ban
- block:
- name: Set Alpine firewall packages
set_fact:
alpine_firewall_packages:
- awall
- fail2ban
- name: Install Alpine firewall packages
apk: name={{ alpine_firewall_packages }} state=present
# vim: set sw=2 ts=2:

View File

@ -17,6 +17,11 @@
when: ansible_distribution == 'Ubuntu' when: ansible_distribution == 'Ubuntu'
tags: packages tags: packages
- name: Install common packages
include_tasks: packages_Alpine.yml
when: ansible_distribution == 'Alpine'
tags: packages
- name: Configure firewall - name: Configure firewall
include_tasks: firewall_Debian.yml include_tasks: firewall_Debian.yml
when: ansible_distribution == 'Debian' when: ansible_distribution == 'Debian'

View File

@ -1,6 +1,7 @@
--- ---
# Hosts running Ubuntu 16.04+ and Debian 9+ use systemd init system and should # Hosts running Ubuntu 16.04+ and Debian 9+ use systemd init system and should
# use timedatectl as a network time client instead of the standalone ntp client. # use timedatectl as a network time client instead of the standalone ntp client.
# Alpine can use chrony.
- name: Set timezone - name: Set timezone
when: timezone is defined and ansible_service_mgr == 'systemd' when: timezone is defined and ansible_service_mgr == 'systemd'
@ -15,4 +16,8 @@
apt: name=ntp state=absent update_cache=yes apt: name=ntp state=absent update_cache=yes
when: ansible_service_mgr == 'systemd' when: ansible_service_mgr == 'systemd'
- name: Install chronyd on Alpine
apt: name=chrony state=present
when: ansible_distribution == 'Alpine'
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

View File

@ -0,0 +1,28 @@
---
# requires: ansible-galaxy collection install community.general
# TODO: configure tarsnap
- block:
- name: Upgrade base OS
apk: upgrade=yes update_cache=yes
- name: Set Alpine base packages
set_fact:
alpine_base_packages:
- git
- tmux
- htop
- strace
- mosh
- vim
- unzip
- zstd
- name: Install Alpine base packages
apk: name={{ alpine_base_packages }} state=present update_cache=yes
#- name: Install tarsnap
# import_tasks: tarsnap.yml
tags: packages
# vim: set sw=2 ts=2:

View File

@ -2,11 +2,10 @@
# file: roles/mariadb/defaults/main.yml # file: roles/mariadb/defaults/main.yml
# #
# Based on my running of mysqltuner.pl on a host with three WordPress databases # Based on my running of mysqltuner.pl on a host with three WordPress databases
# and a Piwik instance monitoring three sites.
# #
# default is 128MB but is a waste because it seems only the mysql table uses it # default is 128MB but is a waste because it seems only the mysql table uses it
key_buffer_size: 32M key_buffer_size: 8M
# default is 128MB but is a waste because it seems only information_schema uses # default is 128MB but is a waste because it seems only information_schema uses
# AriaDB, see: https://mariadb.com/kb/en/mariadb/aria-system-variables # AriaDB, see: https://mariadb.com/kb/en/mariadb/aria-system-variables
@ -15,10 +14,6 @@ aria_pagecache_buffer_size: 8M
# default is 128M, but set to at least the size of your InnoDB data # default is 128M, but set to at least the size of your InnoDB data
innodb_buffer_pool_size: 256M innodb_buffer_pool_size: 256M
# Unless you have a pool size over 1GB, use a single instance
# See: https://mariadb.com/kb/en/mariadb/xtradbinnodb-server-system-variables
innodb_buffer_pool_instances: 1
# Ansible 2.7.x with PyMySQL seems to default to TCP connection so we should # Ansible 2.7.x with PyMySQL seems to default to TCP connection so we should
# force it to use a Unix socket. # force it to use a Unix socket.
# See: https://github.com/ansible/ansible/issues/47736 # See: https://github.com/ansible/ansible/issues/47736
@ -27,4 +22,12 @@ mariadb_login_unix_socket: /var/run/mysqld/mysqld.sock
# default is 100 but the max I've seen used is 5, so let's reduce it # default is 100 but the max I've seen used is 5, so let's reduce it
max_connections: 33 max_connections: 33
# disable the query cache by default
query_cache_size: 0
query_cache_type: 0
# mysqltuner says we should use larger than 32M on our setup
tmp_table_size: 64M
max_heap_table_size: 64M
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

View File

@ -1,5 +1,5 @@
--- ---
- name: restart mysql - name: restart mariadb
systemd: name=mysql state=restarted systemd: name=mariadb state=restarted
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

View File

@ -1,10 +1,10 @@
--- ---
- name: Add GPG key for MariaDB repo - name: Add GPG key for MariaDB repo
apt_key: id=0x177F4010FE56CA3336300305F1656F24C74CD1D8 url=https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x177F4010FE56CA3336300305F1656F24C74CD1D8 apt_key: id=0x177F4010FE56CA3336300305F1656F24C74CD1D8 url=https://mariadb.org/mariadb_release_signing_key.asc
register: add_mariadb_apt_key register: add_mariadb_apt_key
tags: mariadb, packages tags: mariadb, packages
- name: Add MariaDB 10.4 repo - name: Add MariaDB 10.5 repo
template: src=mariadb.list.j2 dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644 template: src=mariadb.list.j2 dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644
register: add_mariadb_apt_repository register: add_mariadb_apt_repository
tags: mariadb, packages tags: mariadb, packages
@ -26,7 +26,7 @@
- name: Create system my.cnf - name: Create system my.cnf
template: src=my.cnf.j2 dest=/etc/mysql/my.cnf owner=root group=root mode=0644 template: src=my.cnf.j2 dest=/etc/mysql/my.cnf owner=root group=root mode=0644
notify: notify:
- restart mysql - restart mariadb
tags: mariadb tags: mariadb
# 'localhost' needs to be the last item for idempotency, see # 'localhost' needs to be the last item for idempotency, see
@ -51,7 +51,7 @@
tags: mariadb tags: mariadb
- name: Create MariaDB user(s) - name: Create MariaDB user(s)
mysql_user: name={{ item.user }} password={{ item.pass }} priv={{ item.name }}.*:ALL state=present mysql_user: name={{ item.user }} password={{ item.pass }} priv={{ item.name }}.*:ALL host=127.0.0.1 state=present
loop: "{{ mariadb_databases }}" loop: "{{ mariadb_databases }}"
when: mariadb_databases is defined when: mariadb_databases is defined
tags: mariadb tags: mariadb

View File

@ -1,3 +1,3 @@
{{ ansible_managed | comment }} {{ ansible_managed | comment }}
deb [arch=amd64] http://mirror.23media.de/mariadb/repo/10.4/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main deb [arch=amd64] http://mirror.23media.de/mariadb/repo/10.5/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main

View File

@ -47,6 +47,10 @@ skip-external-locking
# Instead of skip-networking the default is now to listen only on # Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure. # localhost which is more compatible and is not less secure.
bind-address = 127.0.0.1 bind-address = 127.0.0.1
# don't resolve connection IPs to hostnames (make sure user accounts are using
# IPs instead of "localhost")
skip-name-resolve=1
# #
# * Fine Tuning # * Fine Tuning
# #
@ -57,8 +61,8 @@ max_allowed_packet = 16M
thread_cache_size = 128 thread_cache_size = 128
sort_buffer_size = 4M sort_buffer_size = 4M
bulk_insert_buffer_size = 16M bulk_insert_buffer_size = 16M
tmp_table_size = 32M tmp_table_size = {{ tmp_table_size }}
max_heap_table_size = 32M max_heap_table_size = {{ max_heap_table_size }}
# #
# * MyISAM # * MyISAM
# #
@ -75,11 +79,9 @@ read_rnd_buffer_size = 1M
# #
# * Query Cache Configuration # * Query Cache Configuration
# #
# Cache only tiny result sets, so we can fit more in the query cache.
query_cache_limit = 128K query_cache_limit = 128K
query_cache_size = 64M query_cache_size = {{ query_cache_size }}
# for more write intensive setups, set to DEMAND or OFF query_cache_type = {{ query_cache_type }}
#query_cache_type = DEMAND
# #
# * Logging and Replication # * Logging and Replication
# #
@ -141,7 +143,6 @@ innodb_file_per_table = 1
innodb_open_files = 400 innodb_open_files = 400
innodb_io_capacity = 400 innodb_io_capacity = 400
innodb_flush_method = O_DIRECT innodb_flush_method = O_DIRECT
innodb_buffer_pool_instances = {{ innodb_buffer_pool_instances }}
aria_pagecache_buffer_size = {{ aria_pagecache_buffer_size }} aria_pagecache_buffer_size = {{ aria_pagecache_buffer_size }}
# #

View File

@ -128,7 +128,7 @@
- name: Copy certbot post and pre hooks for nginx - name: Copy certbot post and pre hooks for nginx
copy: src={{ item.src }} dest={{ item.dest }} owner=root group=root mode=0755 copy: src={{ item.src }} dest={{ item.dest }} owner=root group=root mode=0755
with_items: with_items:
- { src: 'stop-nginx.sh', dest: '/etc/letsencrypt/renewal-hooks/post/stop-nginx.sh' } - { 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' } - { 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', '==')

View File

@ -26,7 +26,12 @@ server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
{# Allow sites to override the nginx document root #}
{% if item.document_root is defined %}
root {{ item.document_root }};
{% else %}
root {{ nginx_root_prefix }}/{{ domain_name }}; root {{ nginx_root_prefix }}/{{ domain_name }};
{% endif %}
{# will only work if the TLS cert covers the domain + aliases, like example.com and www.example.com #} {# will only work if the TLS cert covers the domain + aliases, like example.com and www.example.com #}
server_name {{ domain_name }} {{ domain_aliases }}; server_name {{ domain_name }} {{ domain_aliases }};

View File

@ -9,9 +9,6 @@
- php-mysql - php-mysql
- php-gd - php-gd
- php-curl - php-curl
# for Piwik
- php-mbstring
- php-xml
- name: Install php-fpm and deps - name: Install php-fpm and deps
apt: name={{ php_fpm_packages }} state=present update_cache=yes apt: name={{ php_fpm_packages }} state=present update_cache=yes
@ -32,5 +29,6 @@
template: src=php7.3-php.ini.j2 dest=/etc/php/7.3/fpm/php.ini owner=root group=root mode=0644 template: src=php7.3-php.ini.j2 dest=/etc/php/7.3/fpm/php.ini owner=root group=root mode=0644
notify: reload php7.3-fpm notify: reload php7.3-fpm
tags: php-fpm tags: php-fpm
when: (item.has_wordpress is defined and item.has_wordpress) or (item.needs_php is defined and item.needs_php)
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

View File

@ -9,9 +9,6 @@
- php-mysql - php-mysql
- php-gd - php-gd
- php-curl - php-curl
# for Piwik
- php-mbstring
- php-xml
- name: Install php-fpm and deps - name: Install php-fpm and deps
apt: name={{ php_fpm_packages }} state=present update_cache=yes apt: name={{ php_fpm_packages }} state=present update_cache=yes
@ -32,5 +29,6 @@
template: src=php7.2-php.ini.j2 dest=/etc/php/7.2/fpm/php.ini owner=root group=root mode=0644 template: src=php7.2-php.ini.j2 dest=/etc/php/7.2/fpm/php.ini owner=root group=root mode=0644
notify: reload php7.2-fpm notify: reload php7.2-fpm
tags: php-fpm tags: php-fpm
when: (item.has_wordpress is defined and item.has_wordpress) or (item.needs_php is defined and item.needs_php)
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

View File

@ -9,9 +9,6 @@
- php-mysql - php-mysql
- php-gd - php-gd
- php-curl - php-curl
# for Piwik
- php-mbstring
- php-xml
- name: Install php-fpm and deps - name: Install php-fpm and deps
apt: name={{ php_fpm_packages }} state=present update_cache=yes apt: name={{ php_fpm_packages }} state=present update_cache=yes
@ -32,5 +29,6 @@
template: src=php7.4-php.ini.j2 dest=/etc/php/7.4/fpm/php.ini owner=root group=root mode=0644 template: src=php7.4-php.ini.j2 dest=/etc/php/7.4/fpm/php.ini owner=root group=root mode=0644
notify: reload php7.4-fpm notify: reload php7.4-fpm
tags: php-fpm tags: php-fpm
when: (item.has_wordpress is defined and item.has_wordpress) or (item.needs_php is defined and item.needs_php)
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

10
vars/Alpine.yml Normal file
View File

@ -0,0 +1,10 @@
---
# sshd service name is `ssh` on Debian/Ubuntu, but it's
# `sshd` on CentOS and Alpine
sshd_service_name: sshd
# provisioning user vars
provisioning_user: { name: 'provisioning', home: '/home/provisioning' }
# vim: set ts=2 sw=2:

View File

@ -6,7 +6,7 @@
become: yes become: yes
roles: roles:
- common - common
- mariadb - { role: mariadb, when: mariadb_databases is defined}
- nginx - nginx
- php-fpm - php-fpm
- munin - munin