puppet-swh-site merge requests
https://gitlab.softwareheritage.org/swh/infra/puppet/puppet-swh-site/-/merge_requests
2023-12-05T14:04:31Z
https://gitlab.softwareheritage.org/swh/infra/puppet/puppet-swh-site/-/merge_requests/664
Migrate jesuisgpl filepaths access
2023-12-05T14:04:31Z
Antoine R. Dumont
Migrate jesuisgpl filepaths access
This will be changed in the next version.
<details><summary>swh-octo-diff pergamon</summary>
```diff
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************...
This will be changed in the next version.
<details><summary>swh-octo-diff pergamon</summary>
```diff
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
Concat::Fragment[icinga2::object::CheckCommand::production-check-deposit-cmd] =>
parameters =>
content =>
@@ -3,5 +3,5 @@
import "plugin-check-command"
_
- command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml", ]
+ command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
timeout = 4800
}
*******************************************
Concat::Fragment[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
parameters =>
content =>
@@ -3,5 +3,5 @@
import "plugin-check-command"
_
- command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml", ]
+ command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
timeout = 4800
}
*******************************************
Concat_fragment[icinga2::object::CheckCommand::production-check-deposit-cmd] =>
parameters =>
content =>
@@ -3,5 +3,5 @@
import "plugin-check-command"
_
- command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml", ]
+ command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
timeout = 4800
}
*******************************************
Concat_fragment[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
parameters =>
content =>
@@ -3,5 +3,5 @@
import "plugin-check-command"
_
- command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml", ]
+ command = [ "/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", 600, "--critical", 3600, "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml", ]
timeout = 4800
}
*******************************************
File[/etc/bind/keys/local-update] =>
parameters =>
content =>
@@ -2,4 +2,4 @@
key local-update {
algorithm hmac-sha256;
- secret "0qkQKCo15djHtFb7VnJxpfs8Zbm0P6vSztVJ68ftNO4oSwJP6oz3Nj/+wOccXEccD9pCRRgO/YgqjPbAbOQ5RA==";
+ secret "PfGIy+3JbQkxZC51A2PgsNio/wwx0GhKHmW3e+6rtYPfw7xIFMEklfNzie+vTHQE6SKEPaWe/ek/cOLg0SqlNQ==";
};
*******************************************
File[/etc/bind/rndc.key] =>
parameters =>
content =>
@@ -2,4 +2,4 @@
key rndc-key {
algorithm hmac-md5;
- secret "3M47HYsgLzRttTdoAcL7O2YilOuGzCGUtEQLYi8gMYdpa4/UiRH0AaqFZlQeQrtXdIjb61m0b0GlfQRmpAmXgg==";
+ secret "Au0gFdIv7eKmcstsF7ALNWjK0P1IojWQKmkTsQnfn5gwLeM/YFzCJb/vhYVOMa+do6HbsXCiNXVUErbIFee63w==";
};
*******************************************
Icinga2::Object::Checkcommand[production-check-deposit-cmd] =>
parameters =>
command =>
- ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"]
+ ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
*******************************************
Icinga2::Object::Checkcommand[staging-check-deposit-cmd] =>
parameters =>
command =>
- ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"]
+ ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
*******************************************
Icinga2::Object[icinga2::object::CheckCommand::production-check-deposit-cmd] =>
parameters =>
attrs =>
command =>
- ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"]
+ ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "production", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
*******************************************
Icinga2::Object[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
parameters =>
attrs =>
command =>
- ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"]
+ ["/usr/bin/swh", "icinga_plugins", "--prometheus-exporter", "--prometheus-exporter-directory", "/var/lib/prometheus/node-exporter", "--environment", "staging", "--warning", "600", "--critical", "3600", "check-deposit", "--server", "https://deposit.softwareheritage.org/1", "--username", "swh", "--password", "swh-deploy-deposit-e2e-password", "--collection", "swh", "--provider-url", "https://www.softwareheritage.org", "--swh-web-url", "https://archive.softwareheritage.org", "--poll-interval", 1, "single", "--archive", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz", "--metadata", "/usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml"]
*******************************************
Profile::Icinga2::Objects::E2e_checks_deposit[End-to-end Deposit Test(s) in production] =>
parameters =>
deposit_archive =>
- /usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz
+ /usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz
deposit_metadata =>
- /usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml
+ /usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml
*******************************************
Profile::Icinga2::Objects::E2e_checks_deposit[End-to-end Deposit Test(s) in staging] =>
parameters =>
deposit_archive =>
- /usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz
+ /usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz
deposit_metadata =>
- /usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml
+ /usr/lib/python3/dist-packages/swh/icinga_plugins/data/deposit/jesuisgpl.tgz.xml
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org
+ set +x
/home/tony/work/inria/repo/swh/puppet-environment/swh-site
```
</details>
Refs. swh/devel/swh-icinga-plugins!56
Refs. swh/infra/sysadm-environment#5180
https://gitlab.softwareheritage.org/swh/infra/puppet/puppet-swh-site/-/merge_requests/487
Remove role swh.vault.git_bare.ui
2022-11-29T09:55:32Z
vlorentz
Remove role swh.vault.git_bare.ui
It is not used anymore
Depends on [D7120](https://forge.softwareheritage.org/D7120 'view original for D7120 on Phabricator') being deployed.
----
*Migrated from D7121 ([view on Phabricator](https://forge.softwareheritage.org/D7121))*
It is not used anymore
Depends on [D7120](https://forge.softwareheritage.org/D7120 'view original for D7120 on Phabricator') being deployed.
----
*Migrated from D7121 ([view on Phabricator](https://forge.softwareheritage.org/D7121))*
https://gitlab.softwareheritage.org/swh/infra/puppet/puppet-swh-site/-/merge_requests/305
Programmatically set up keycloak client for hedgedoc
2022-11-29T09:55:45Z
Nicolas Dandrimont
olasd@softwareheritage.org
Programmatically set up keycloak client for hedgedoc
Depends on !304
## Test Plan
incomplete/untested so far
----
*Migrated from D4995 ([view on Phabricator](https://forge.softwareheritage.org/D4995))*
Depends on !304
## Test Plan
incomplete/untested so far
----
*Migrated from D4995 ([view on Phabricator](https://forge.softwareheritage.org/D4995))*