Merge staging into production

• Split public and private keys (!114 (merged) and !116 (merged))
• Add payment server monitoring (!117 (merged))
• Minor nix-shell improvements (!111 (merged))
• CI improvements for docs (!113 (merged))
• Swap re-configuration (!103 (merged))
• morph node name simplification (!110 (merged))
• Refactored morph grid definition (!109 (merged))
• GSuite SSO for Grafana (!120 (merged))
• Upgrade systems to NixOS 21.05 (!121 (merged))
• Continuous deployment system (!115 (merged))
• Disable Grafana statistics reporting (!119 (merged))
• Try to fix the continuous deployment configuration (!124 (merged))
• Attempt to fix GitLab continuous deployment configuration (!126 (merged))
• Attempt to fix GitLab continuous deployment configuration (!128 (merged))
• Propagate morph exit status out of update script (!132 (merged))
• Supply ssh host keys to deployment script (!130 (merged))
• Prevent <nixpkgs> path from growing until it breaks nix tools (!131 (merged))
• Fix permissions on the deploy key so continuous deployment can authenticate (!134 (merged))
• Fix usage of the deploy key environment variable (!136 (merged))
• Fix whitespace problems with the deploy key that prevent it from being used (!138 (merged))
• Set initial Grafana web admin password (!123 (merged))

added 7 commits

• 8dbb3544 - grafana.nix: Formatting/white space/putting things in their right name space
• 652b01a5 - Grafana: Set admin PW
• cf734f31 - Statically configure a password for localdev Grafana admin
• a402ca80 - write some more words about secrets
• d47a8798 - note about public parts
• 1b7252b5 - Merge branch 'monitoring-set-admin-pw' into 'develop'
• f522504b - Merge branch 'develop' into 'staging'

Compare with previous version

marked this merge request as ready

changed the description

merged

mentioned in commit 2b88656a