diff options
-rw-r--r-- | doc-requirements.txt | 23 | ||||
-rw-r--r-- | docs/Pipfile.lock | 137 | ||||
-rw-r--r-- | docs/external/extmon.rst | 4 | ||||
-rw-r--r-- | docs/systems/blog.rst | 4 | ||||
-rw-r--r-- | docs/systems/bugs.rst | 61 | ||||
-rw-r--r-- | docs/systems/community.rst | 16 | ||||
-rw-r--r-- | docs/systems/email.rst | 4 | ||||
-rw-r--r-- | docs/systems/emailout.rst | 4 | ||||
-rw-r--r-- | docs/systems/git.rst | 6 | ||||
-rw-r--r-- | docs/systems/infra02.rst | 4 | ||||
-rw-r--r-- | docs/systems/ircserver.rst | 4 | ||||
-rw-r--r-- | docs/systems/issue.rst | 8 | ||||
-rw-r--r-- | docs/systems/jenkins.rst | 4 | ||||
-rw-r--r-- | docs/systems/monitor.rst | 4 | ||||
-rw-r--r-- | docs/systems/motion.rst | 4 | ||||
-rw-r--r-- | docs/systems/proxyin.rst | 91 | ||||
-rw-r--r-- | docs/systems/proxyout.rst | 4 | ||||
-rw-r--r-- | docs/systems/puppet.rst | 4 | ||||
-rw-r--r-- | docs/systems/svn.rst | 4 | ||||
-rw-r--r-- | docs/systems/test3.rst | 4 | ||||
-rw-r--r-- | docs/systems/translations.rst | 4 | ||||
-rw-r--r-- | docs/systems/web.rst | 4 | ||||
-rw-r--r-- | docs/systems/webstatic.rst | 4 | ||||
-rw-r--r-- | docs/systems/wiki.rst | 4 |
24 files changed, 208 insertions, 202 deletions
diff --git a/doc-requirements.txt b/doc-requirements.txt index 89ea074..7a7f8cd 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -1,46 +1,32 @@ alabaster==0.7.12 -appdirs==1.4.3 Babel==2.9.0 blockdiag==2.0.1 -CacheControl==0.12.6 certifi==2020.12.5 chardet==4.0.0 -colorama==0.4.3 -contextlib2==0.6.0 dateutils==0.6.12 -distlib==0.3.0 -distro==1.4.0 docutils==0.16 funcparserlib==0.3.6 gitdb==4.0.5 -GitPython==3.1.11 -html5lib==1.0.1 +GitPython==3.1.12 idna==2.10 imagesize==1.2.0 -ipaddr==2.2.0 ipcalc==1.99.0 jandd.sphinxext.ip==0.4.0 jandd.sphinxext.mac==0.1.0 Jinja2==2.11.2 -lockfile==0.12.2 MarkupSafe==1.1.1 -msgpack==0.6.2 nwdiag==2.0.0 packaging==20.8 -pep517==0.8.2 -Pillow==8.0.1 -progress==1.5 -Pygments==2.7.3 +Pillow==8.1.0 +Pygments==2.7.4 pyparsing==2.4.7 python-dateutil==2.8.1 -pytoml==0.1.21 pytz==2020.5 requests==2.25.1 -retrying==1.3.3 six==1.15.0 smmap==3.0.4 snowballstemmer==2.0.0 -Sphinx==3.4.1 +Sphinx==3.4.3 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-blockdiag==2.0.0 sphinxcontrib-devhelp==1.0.2 @@ -52,4 +38,3 @@ sphinxcontrib-serializinghtml==1.1.4 urllib3==1.26.2 validate-email==1.3 webcolors==1.11.1 -webencodings==0.5.1 diff --git a/docs/Pipfile.lock b/docs/Pipfile.lock index ca8310e..88830f4 100644 --- a/docs/Pipfile.lock +++ b/docs/Pipfile.lock @@ -84,11 +84,11 @@ }, "gitpython": { "hashes": [ - "sha256:6eea89b655917b500437e9668e4a12eabdcf00229a0df1762aabd692ef9b746b", - "sha256:befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8" + "sha256:42dbefd8d9e2576c496ed0059f3103dcef7125b9ce16f9d5f9c834aed44a1dac", + "sha256:867ec3dfb126aac0f8296b19fb63b8c4a399f32b4b6fafe84c4b10af5fa9f7b5" ], "index": "pypi", - "version": "==3.1.11" + "version": "==3.1.12" }, "idna": { "hashes": [ @@ -130,11 +130,11 @@ }, "jinja2": { "hashes": [ - "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", - "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" + "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", + "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" ], "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": { "hashes": [ @@ -143,8 +143,12 @@ "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f", + "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39", "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014", + "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f", "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", @@ -153,24 +157,39 @@ "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85", + "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1", "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850", + "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0", "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb", "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1", + "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2", "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:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be", + "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" @@ -184,53 +203,57 @@ }, "packaging": { "hashes": [ - "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858", - "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" + "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5", + "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==20.8" + "version": "==20.9" }, "pillow": { "hashes": [ - "sha256:006de60d7580d81f4a1a7e9f0173dc90a932e3905cc4d47ea909bc946302311a", - "sha256:0a2e8d03787ec7ad71dc18aec9367c946ef8ef50e1e78c71f743bc3a770f9fae", - "sha256:0eeeae397e5a79dc088d8297a4c2c6f901f8fb30db47795113a4a605d0f1e5ce", - "sha256:11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e", - "sha256:2fb113757a369a6cdb189f8df3226e995acfed0a8919a72416626af1a0a71140", - "sha256:4b0ef2470c4979e345e4e0cc1bbac65fda11d0d7b789dbac035e4c6ce3f98adb", - "sha256:59e903ca800c8cfd1ebe482349ec7c35687b95e98cefae213e271c8c7fffa021", - "sha256:5abd653a23c35d980b332bc0431d39663b1709d64142e3652890df4c9b6970f6", - "sha256:5f9403af9c790cc18411ea398a6950ee2def2a830ad0cfe6dc9122e6d528b302", - "sha256:6b4a8fd632b4ebee28282a9fef4c341835a1aa8671e2770b6f89adc8e8c2703c", - "sha256:6c1aca8231625115104a06e4389fcd9ec88f0c9befbabd80dc206c35561be271", - "sha256:795e91a60f291e75de2e20e6bdd67770f793c8605b553cb6e4387ce0cb302e09", - "sha256:7ba0ba61252ab23052e642abdb17fd08fdcfdbbf3b74c969a30c58ac1ade7cd3", - "sha256:7c9401e68730d6c4245b8e361d3d13e1035cbc94db86b49dc7da8bec235d0015", - "sha256:81f812d8f5e8a09b246515fac141e9d10113229bc33ea073fec11403b016bcf3", - "sha256:895d54c0ddc78a478c80f9c438579ac15f3e27bf442c2a9aa74d41d0e4d12544", - "sha256:8de332053707c80963b589b22f8e0229f1be1f3ca862a932c1bcd48dafb18dd8", - "sha256:92c882b70a40c79de9f5294dc99390671e07fc0b0113d472cbea3fde15db1792", - "sha256:95edb1ed513e68bddc2aee3de66ceaf743590bf16c023fb9977adc4be15bd3f0", - "sha256:b63d4ff734263ae4ce6593798bcfee6dbfb00523c82753a3a03cbc05555a9cc3", - "sha256:bd7bf289e05470b1bc74889d1466d9ad4a56d201f24397557b6f65c24a6844b8", - "sha256:cc3ea6b23954da84dbee8025c616040d9aa5eaf34ea6895a0a762ee9d3e12e11", - "sha256:cc9ec588c6ef3a1325fa032ec14d97b7309db493782ea8c304666fb10c3bd9a7", - "sha256:d3d07c86d4efa1facdf32aa878bd508c0dc4f87c48125cc16b937baa4e5b5e11", - "sha256:d8a96747df78cda35980905bf26e72960cba6d355ace4780d4bdde3b217cdf1e", - "sha256:e38d58d9138ef972fceb7aeec4be02e3f01d383723965bfcef14d174c8ccd039", - "sha256:eb472586374dc66b31e36e14720747595c2b265ae962987261f044e5cce644b5", - "sha256:fbd922f702582cb0d71ef94442bfca57624352622d75e3be7a1e7e9360b07e72" + "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6", + "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded", + "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865", + "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174", + "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032", + "sha256:3de6b2ee4f78c6b3d89d184ade5d8fa68af0848f9b6b6da2b9ab7943ec46971a", + "sha256:47c0d93ee9c8b181f353dbead6530b26980fe4f5485aa18be8f1fd3c3cbc685e", + "sha256:5e2fe3bb2363b862671eba632537cd3a823847db4d98be95690b7e382f3d6378", + "sha256:604815c55fd92e735f9738f65dabf4edc3e79f88541c221d292faec1904a4b17", + "sha256:6c5275bd82711cd3dcd0af8ce0bb99113ae8911fc2952805f1d012de7d600a4c", + "sha256:731ca5aabe9085160cf68b2dbef95fc1991015bc0a3a6ea46a371ab88f3d0913", + "sha256:7612520e5e1a371d77e1d1ca3a3ee6227eef00d0a9cddb4ef7ecb0b7396eddf7", + "sha256:7916cbc94f1c6b1301ac04510d0881b9e9feb20ae34094d3615a8a7c3db0dcc0", + "sha256:81c3fa9a75d9f1afafdb916d5995633f319db09bd773cb56b8e39f1e98d90820", + "sha256:887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba", + "sha256:93a473b53cc6e0b3ce6bf51b1b95b7b1e7e6084be3a07e40f79b42e83503fbf2", + "sha256:96d4dc103d1a0fa6d47c6c55a47de5f5dafd5ef0114fa10c85a1fd8e0216284b", + "sha256:a3d3e086474ef12ef13d42e5f9b7bbf09d39cf6bd4940f982263d6954b13f6a9", + "sha256:b02a0b9f332086657852b1f7cb380f6a42403a6d9c42a4c34a561aa4530d5234", + "sha256:b09e10ec453de97f9a23a5aa5e30b334195e8d2ddd1ce76cc32e52ba63c8b31d", + "sha256:b6f00ad5ebe846cc91763b1d0c6d30a8042e02b2316e27b05de04fa6ec831ec5", + "sha256:bba80df38cfc17f490ec651c73bb37cd896bc2400cfba27d078c2135223c1206", + "sha256:c3d911614b008e8a576b8e5303e3db29224b455d3d66d1b2848ba6ca83f9ece9", + "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8", + "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59", + "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d", + "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7", + "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a", + "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0", + "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b", + "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d", + "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae" ], "markers": "python_version >= '3.6'", - "version": "==8.0.1" + "version": "==8.1.0" }, "pygments": { "hashes": [ - "sha256:ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716", - "sha256:f275b6c0909e5dafd2d6269a656aa90fa58ebf4a74f8fcf9053195d226b24a08" + "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435", + "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337" ], "markers": "python_version >= '3.5'", - "version": "==2.7.3" + "version": "==2.7.4" }, "pyparsing": { "hashes": [ @@ -250,10 +273,10 @@ }, "pytz": { "hashes": [ - "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4", - "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5" + "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da", + "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798" ], - "version": "==2020.5" + "version": "==2021.1" }, "requests": { "hashes": [ @@ -273,26 +296,26 @@ }, "smmap": { "hashes": [ - "sha256:54c44c197c819d5ef1991799a7e30b662d1e520f2ac75c9efbeb54a742214cf4", - "sha256:9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24" + "sha256:7bfcf367828031dc893530a29cb35eb8c8f2d7c8f2d0989354d75d24c8573714", + "sha256:84c2751ef3072d4f6b2785ec7ee40244c6f45eb934d9e543e2c51f1bd3d54c50" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==3.0.4" + "version": "==3.0.5" }, "snowballstemmer": { "hashes": [ - "sha256:209f257d7533fdb3cb73bdbd24f436239ca3b2fa67d56f6ff88e86be08cc5ef0", - "sha256:df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52" + "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2", + "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914" ], - "version": "==2.0.0" + "version": "==2.1.0" }, "sphinx": { "hashes": [ - "sha256:aeef652b14629431c82d3fe994ce39ead65b3fe87cf41b9a3714168ff8b83376", - "sha256:e450cb205ff8924611085183bf1353da26802ae73d9251a8fcdf220a8f8712ef" + "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c", + "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8" ], "index": "pypi", - "version": "==3.4.1" + "version": "==3.4.3" }, "sphinxcontrib-applehelp": { "hashes": [ @@ -360,11 +383,11 @@ }, "urllib3": { "hashes": [ - "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08", - "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473" + "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80", + "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "version": "==1.26.2" + "version": "==1.26.3" }, "validate-email": { "hashes": [ diff --git a/docs/external/extmon.rst b/docs/external/extmon.rst index 6a52ca9..ef5e03a 100644 --- a/docs/external/extmon.rst +++ b/docs/external/extmon.rst @@ -90,9 +90,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.3 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.3 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/blog.rst b/docs/systems/blog.rst index 7e117fa..bf47af8 100644 --- a/docs/systems/blog.rst +++ b/docs/systems/blog.rst @@ -131,9 +131,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.3 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.3 +* Debian GNU/Linux 10.8 Applicable Documentation ------------------------ diff --git a/docs/systems/bugs.rst b/docs/systems/bugs.rst index 61e056a..c56c0d6 100644 --- a/docs/systems/bugs.rst +++ b/docs/systems/bugs.rst @@ -109,10 +109,10 @@ Operating System ---------------- .. index:: - single: Debian GNU/Linux; Stretch - single: Debian GNU/Linux; 9.9 + single: Debian GNU/Linux; Buster + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 9.9 +* Debian GNU/Linux 10.8 Services ======== @@ -120,21 +120,21 @@ Services Listening services ------------------ -+----------+---------+---------+--------------------------------+ -| Port | Service | Origin | Purpose | -+==========+=========+=========+================================+ -| 22/tcp | ssh | ANY | admin console access | -+----------+---------+---------+--------------------------------+ -| 25/tcp | smtp | local | mail delivery to local MTA | -+----------+---------+---------+--------------------------------+ -| 80/tcp | http | ANY | web server for bug tracker | -+----------+---------+---------+--------------------------------+ -| 443/tcp | https | ANY | web server for bug tracker | -+----------+---------+---------+--------------------------------+ -| 5665/tcp | icinga2 | monitor | remote monitoring service | -+----------+---------+---------+--------------------------------+ -| 3306/tcp | mysql | local | MySQL database for bug tracker | -+----------+---------+---------+--------------------------------+ ++----------+---------+---------+----------------------------------+ +| Port | Service | Origin | Purpose | ++==========+=========+=========+==================================+ +| 22/tcp | ssh | ANY | admin console access | ++----------+---------+---------+----------------------------------+ +| 25/tcp | smtp | local | mail delivery to local MTA | ++----------+---------+---------+----------------------------------+ +| 80/tcp | http | ANY | web server for bug tracker | ++----------+---------+---------+----------------------------------+ +| 443/tcp | https | ANY | web server for bug tracker | ++----------+---------+---------+----------------------------------+ +| 5665/tcp | icinga2 | monitor | remote monitoring service | ++----------+---------+---------+----------------------------------+ +| 3306/tcp | mariadb | local | MariaDB database for bug tracker | ++----------+---------+---------+----------------------------------+ Running services ---------------- @@ -187,6 +187,7 @@ Databases .. index:: pair: MySQL database; mantis + pair: MariaDB database; mantis +---------+--------+--------------------+ | RDBMS | Name | Used for | @@ -329,25 +330,7 @@ MySQL configuration is stored in the :file:`/etc/mysql/` directory. Rsyslog configuration --------------------- -Rsyslog has been configured to disable draining the kernel log: - -.. code-block:: diff - - --- orig/etc/rsyslog.conf 2015-12-14 13:34:27.000000000 +0100 - +++ bugs/etc/rsyslog.conf 2015-03-03 22:22:44.385835152 +0100 - @@ -9,7 +9,7 @@ - ################# - - $ModLoad imuxsock # provides support for local system logging - -$ModLoad imklog # provides kernel logging support - +#$ModLoad imklog # provides kernel logging support - #$ModLoad immark # provides --MARK-- message capability - - # provides UDP syslog reception - -The :program:`postfix` package installed :file:`/etc/rsyslog.d/postfix.conf` to -add an additional logging socket in the Postfix chroot. - +Rsyslog is configured by Puppet. Tasks ===== @@ -361,8 +344,10 @@ Changes Planned ------- -.. todo:: upgrade to Debian 10 (when Puppet is available) +.. todo:: + Switch ingest traffic for webmail to :doc:`proxyin` and drop http redirector + configuration from Apache httpd System Future ------------- diff --git a/docs/systems/community.rst b/docs/systems/community.rst index 9f38456..7bea137 100644 --- a/docs/systems/community.rst +++ b/docs/systems/community.rst @@ -102,9 +102,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.4 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.4 +* Debian GNU/Linux 10.8 Services ======== @@ -121,6 +121,8 @@ Listening services +----------+---------+---------+-----------------------------------------+ | 80/tcp | http | ANY | Apache httpd | +----------+---------+---------+-----------------------------------------+ +| 443/tcp | http | ANY | Apache httpd | ++----------+---------+---------+-----------------------------------------+ | 3306/tcp | mariadb | local | MariaDB database for roundcube settings | +----------+---------+---------+-----------------------------------------+ | 5665/tcp | icinga2 | monitor | remote monitoring service | @@ -147,6 +149,7 @@ Running services | Service | Usage | Start mechanism | +====================+=======================================+=============================================+ | Apache httpd | Webserver for Roundcube webmailer | systemd unit ``apache2.service`` | +| | and redirect from http to https | | +--------------------+---------------------------------------+---------------------------------------------+ | cacert-selfservice | Community self service application | systemd unit ``cacert-selfservice.service`` | +--------------------+---------------------------------------+---------------------------------------------+ @@ -338,6 +341,11 @@ Changes Planned ------- +.. todo:: + + Switch ingest traffic for webmail to :doc:`proxyin` and drop http redirector + configuration from Apache httpd + System Future ------------- @@ -351,4 +359,6 @@ Additional documentation References ---------- -.. could reference Apache httpd, PHP and roundcube documentation +* https://httpd.apache.org/docs/2.4/ +* https://github.com/roundcube/roundcubemail/wiki +* https://www.php.net/manual/en/ diff --git a/docs/systems/email.rst b/docs/systems/email.rst index df527b0..382c09c 100644 --- a/docs/systems/email.rst +++ b/docs/systems/email.rst @@ -116,9 +116,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.4 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.4 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/emailout.rst b/docs/systems/emailout.rst index 495b87e..fdd6721 100644 --- a/docs/systems/emailout.rst +++ b/docs/systems/emailout.rst @@ -98,9 +98,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.4 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.4 +* Debian GNU/Linux 10.8 Applicable Documentation ------------------------ diff --git a/docs/systems/git.rst b/docs/systems/git.rst index 62f8e5b..0850d2c 100644 --- a/docs/systems/git.rst +++ b/docs/systems/git.rst @@ -110,10 +110,10 @@ Operating System ---------------- .. index:: - single: Debian GNU/Linux; Stretch - single: Debian GNU/Linux; 10.4 + single: Debian GNU/Linux; Buster + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.4 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/infra02.rst b/docs/systems/infra02.rst index bae9a5b..cbcbee2 100644 --- a/docs/systems/infra02.rst +++ b/docs/systems/infra02.rst @@ -186,9 +186,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.0 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.0 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/ircserver.rst b/docs/systems/ircserver.rst index 229cd74..debd22f 100644 --- a/docs/systems/ircserver.rst +++ b/docs/systems/ircserver.rst @@ -109,9 +109,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.7 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.7 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/issue.rst b/docs/systems/issue.rst index 377ca9f..20488ba 100644 --- a/docs/systems/issue.rst +++ b/docs/systems/issue.rst @@ -105,12 +105,12 @@ Operating System ---------------- .. index:: - single: Debian GNU/Linux; Wheezy - single: Debian GNU/Linux; 7.11 + single: Debian GNU/Linux; Stretch + single: Debian GNU/Linux; 9.13 -* Debian GNU/Linux 7.11 +* Debian GNU/Linux 9.13 -.. todo:: upgrade to Debian Jessie +.. todo:: upgrade to Debian Buster Services ======== diff --git a/docs/systems/jenkins.rst b/docs/systems/jenkins.rst index 0c457f1..49b7a49 100644 --- a/docs/systems/jenkins.rst +++ b/docs/systems/jenkins.rst @@ -104,9 +104,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.0 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.0 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/monitor.rst b/docs/systems/monitor.rst index 47adb94..03a29c1 100644 --- a/docs/systems/monitor.rst +++ b/docs/systems/monitor.rst @@ -112,9 +112,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.3 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.3 +* Debian GNU/Linux 10.8 Applicable Documentation ------------------------ diff --git a/docs/systems/motion.rst b/docs/systems/motion.rst index 6be9617..64d3015 100644 --- a/docs/systems/motion.rst +++ b/docs/systems/motion.rst @@ -109,9 +109,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.0 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.0 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/proxyin.rst b/docs/systems/proxyin.rst index 3ce8cad..ac8bb6a 100644 --- a/docs/systems/proxyin.rst +++ b/docs/systems/proxyin.rst @@ -8,10 +8,10 @@ Proxyin Purpose ======= -This system provides an incoming TLS proxy using `sniproxy`_ to share one -public IPv4 address between multiple services. +This system provides an incoming TLS proxy using `nginx`_ to share one public +IPv4 address between multiple services. -.. _sniproxy: https://github.com/dlundquist/sniproxy +.. _nginx: https://nginx.org/ Application Links ----------------- @@ -109,9 +109,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.0 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.0 +* Debian GNU/Linux 10.8 Services ======== @@ -126,14 +126,12 @@ Listening services +----------+---------+---------+----------------------------+ | 25/tcp | smtp | local | mail delivery to local MTA | +----------+---------+---------+----------------------------+ -| 80/tcp | http | ANY | sniproxy | +| 80/tcp | http | ANY | nginx | +----------+---------+---------+----------------------------+ -| 443/tcp | https | ANY | sniproxy | +| 443/tcp | https | ANY | nginx | +----------+---------+---------+----------------------------+ | 5665/tcp | icinga2 | monitor | remote monitoring service | +----------+---------+---------+----------------------------+ -| 8080/tcp | http | local | nginx | -+----------+---------+---------+----------------------------+ Running services ---------------- @@ -147,31 +145,31 @@ Running services single: openssh single: puppet single: rsyslog - single: sniproxy - -+----------------+--------------------------+-----------------------------------+ -| Service | Usage | Start mechanism | -+================+==========================+===================================+ -| cron | job scheduler | systemd unit ``cron.service`` | -+----------------+--------------------------+-----------------------------------+ -| dbus-daemon | System message bus | systemd unit ``dbus.service`` | -| | daemon | | -+----------------+--------------------------+-----------------------------------+ -| Exim | SMTP server for | systemd unit ``exim4.service`` | -| | local mail submission | | -+----------------+--------------------------+-----------------------------------+ -| icinga2 | Icinga2 monitoring agent | systemd unit ``icinga2.service`` | -+----------------+--------------------------+-----------------------------------+ -| openssh server | ssh daemon for | systemd unit ``ssh.service`` | -| | remote administration | | -+----------------+--------------------------+-----------------------------------+ -| Puppet agent | configuration | systemd unit ``puppet.service`` | -| | management agent | | -+----------------+--------------------------+-----------------------------------+ -| sniproxy | TLS SNI proxy | systemd unit ``sniproxy.service`` | -+----------------+--------------------------+-----------------------------------+ -| rsyslog | syslog daemon | systemd unit ``rsyslog.service`` | -+----------------+--------------------------+-----------------------------------+ + ++----------------+--------------------------+----------------------------------+ +| Service | Usage | Start mechanism | ++================+==========================+==================================+ +| cron | job scheduler | systemd unit ``cron.service`` | ++----------------+--------------------------+----------------------------------+ +| dbus-daemon | System message bus | systemd unit ``dbus.service`` | +| | daemon | | ++----------------+--------------------------+----------------------------------+ +| Exim | SMTP server for | systemd unit ``exim4.service`` | +| | local mail submission | | ++----------------+--------------------------+----------------------------------+ +| icinga2 | Icinga2 monitoring agent | systemd unit ``icinga2.service`` | ++----------------+--------------------------+----------------------------------+ +| openssh server | ssh daemon for | systemd unit ``ssh.service`` | +| | remote administration | | ++----------------+--------------------------+----------------------------------+ +| Puppet agent | configuration | systemd unit ``puppet.service`` | +| | management agent | | ++----------------+--------------------------+----------------------------------+ +| nginx | TLS SNI proxy and | systemd unit ``nginx.service`` | +| | http to https redirector | | ++----------------+--------------------------+----------------------------------+ +| rsyslog | syslog daemon | systemd unit ``rsyslog.service`` | ++----------------+--------------------------+----------------------------------+ Databases --------- @@ -190,7 +188,10 @@ Outbound network connections * :doc:`emailout` as SMTP relay * :doc:`puppet` (tcp/8140) as Puppet master * :doc:`proxyout` as HTTP proxy for APT -* :doc:`motion` (tcp/8443) as backend for https://motion.cacert.org/ + +The mapping from host names to target backends is managed via Puppet and +configured in the profiles::sniproxy::https_forwards map in +https://git.cacert.org/cacert-puppet.git/tree/hieradata/nodes/proxyin.yaml. Security ======== @@ -218,9 +219,9 @@ The Puppet agent package and a few dependencies are installed from the official Puppet APT repository because the versions in Debian are too old to use modern Puppet features. -The system is stripped down to the bare minimum. Both :program:`sniproxy` and -:program:`nginx` are security supported. The :program:`nginx-light` package is -used for `nginx` because no special features are required. +The system is stripped down to the bare minimum. :program:`nginx` is security +supported. The :program:`nginx-full` package is used for `nginx` to support +streaming after SNI. Critical Configuration items ============================ @@ -239,11 +240,11 @@ nginx configuration :program:`nginx` is configured via Puppet profile ``profiles::sniproxy`` and just redirects all http traffic to https. -sniproxy configuration ----------------------- +nginx configuration +------------------- -:program:`sniproxy` is configured via Puppet profile ``profiles::sniproxy``, -TCP traffic on port 80 is forwarded to the local nginx and https traffic is +:program:`nginx` is configured via Puppet profile ``profiles::sniproxy``, TCP +traffic on port 80 is redirected to the https port and https traffic is forwarded to the target hosts as configured in :file:`hieradata/nodes/proxyin.yaml`. @@ -254,7 +255,9 @@ Adding a new forward entry -------------------------- Add a line to the ``profiles::sniproxy::https_forwards`` item in Hiera data and -adjust the firewall configuration on :doc:`infra02`. +adjust the firewall configuration on :doc:`infra02`. You will need to request +DNS changes from the critical team if you want to switch an existing service to +use the SNI proxy service. Changes ======= @@ -279,4 +282,4 @@ Additional documentation References ---------- -* https://github.com/dlundquist/sniproxy +* https://nginx.org/en/docs/ diff --git a/docs/systems/proxyout.rst b/docs/systems/proxyout.rst index f48d76e..6929a70 100644 --- a/docs/systems/proxyout.rst +++ b/docs/systems/proxyout.rst @@ -95,9 +95,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.0 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.0 +* Debian GNU/Linux 10.8 Applicable Documentation ------------------------ diff --git a/docs/systems/puppet.rst b/docs/systems/puppet.rst index 1b9da73..d9113ef 100644 --- a/docs/systems/puppet.rst +++ b/docs/systems/puppet.rst @@ -101,9 +101,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.3 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.3 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/svn.rst b/docs/systems/svn.rst index 90c727f..f931461 100644 --- a/docs/systems/svn.rst +++ b/docs/systems/svn.rst @@ -118,9 +118,9 @@ Operating System .. index:: single: Debian GNU/Linux; Stretch - single: Debian GNU/Linux; 9.6 + single: Debian GNU/Linux; 9.13 -* Debian GNU/Linux 9.6 +* Debian GNU/Linux 9.13 Applicable Documentation ------------------------ diff --git a/docs/systems/test3.rst b/docs/systems/test3.rst index f735bec..995afb3 100644 --- a/docs/systems/test3.rst +++ b/docs/systems/test3.rst @@ -126,9 +126,9 @@ Operating System .. index:: single: Debian GNU/Linux; Stretch - single: Debian GNU/Linux; 9.6 + single: Debian GNU/Linux; 9.13 -* Debian GNU/Linux 9.6 +* Debian GNU/Linux 9.13 Applicable Documentation ------------------------ diff --git a/docs/systems/translations.rst b/docs/systems/translations.rst index d4cf6d0..782e6cd 100644 --- a/docs/systems/translations.rst +++ b/docs/systems/translations.rst @@ -111,9 +111,9 @@ Operating System .. index:: single: Debian GNU/Linux; Stretch - single: Debian GNU/Linux; 9.4 + single: Debian GNU/Linux; 9.13 -* Debian GNU/Linux 9.4 +* Debian GNU/Linux 9.13 Services ======== diff --git a/docs/systems/web.rst b/docs/systems/web.rst index 8ed9668..ef1e330 100644 --- a/docs/systems/web.rst +++ b/docs/systems/web.rst @@ -114,9 +114,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.7 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.7 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/webstatic.rst b/docs/systems/webstatic.rst index 1e25064..6aecc81 100644 --- a/docs/systems/webstatic.rst +++ b/docs/systems/webstatic.rst @@ -117,9 +117,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.4 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.4 +* Debian GNU/Linux 10.8 Services ======== diff --git a/docs/systems/wiki.rst b/docs/systems/wiki.rst index c5d9f1d..8b8f906 100644 --- a/docs/systems/wiki.rst +++ b/docs/systems/wiki.rst @@ -111,9 +111,9 @@ Operating System .. index:: single: Debian GNU/Linux; Buster - single: Debian GNU/Linux; 10.3 + single: Debian GNU/Linux; 10.8 -* Debian GNU/Linux 10.3 +* Debian GNU/Linux 10.8 Services ======== |