Skip to content

Commit 86c8d4a

Browse files
Merge pull request #125 from lsst-it/main
Merge to Prod
2 parents 2dedeeb + fad3429 commit 86c8d4a

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

data/node/ceres.lsst.org.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
classes:
3+
- profile::base_linux
4+
profile::base_linux::graylog: true

data/node/juno.lsst.org.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
classes:
3+
- profile::base_linux
4+
profile::base_linux::graylog: true

data/node/passwd2.lsst.org.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
profile::pwm::pwm_version: '2_0_6'
3-
profile::pwm::war_version: '2.0.6'
2+
profile::pwm::pwm_version: '2_0_8'
3+
profile::pwm::war_version: '2.0.8'
44
profile::base_linux::network: true
55
network_config:
66
eth0:

data/node/vesta.lsst.org.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
classes:
3+
- profile::base_linux
4+
profile::base_linux::graylog: true

data/site/po/role/pwm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ profile::tomcat::tomcat_user_hide: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQA
2121
profile::tomcat::tomcat_pass_hide: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASTlh4Dr0MBaO596G+orFr6B/j57Fh2WrKb3lsgLAIpiiAUzkBOzODVCcziMmYEnX/5/r4XAScBKAcVmsEgCqnEAkhRC6XTFlqC3VN3EKMAhS7m85Q1+ZCkOENVWmlCJNF1KHHBY9cHmBUKdG8gTbFGwVvXm/nlkeBeE6iz6NNqMt82OL6PBS1e6MLA4TvG4T/n90k5JPB3eNZGdBn0OCxIbdlzw2rmYzuRpI0q3uNvB74aF3u/YYCS1a9FHEPtHPoYEzkMoMwhXDrMPhx6cjVR/Zqc7QhVbtDsk2e2+wX38XynDhgIXRPfaWIjbOpjcmgVQmMZZAL6bVXeLS0/RtRjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC2h9ixFn/scqAeZkP2NU6JgBCBfTVbZyD2KaHuK3e8zUOq]
2222
profile::tomcat::catalina_home: '/opt/tomcat'
2323
profile::tomcat::catalina_base: '/opt/tomcat'
24-
profile::tomcat::version: 'tomcat-9/v9.0.85/bin/apache-tomcat-9.0.85'
24+
profile::tomcat::version: 'tomcat-9/v9.0.99/bin/apache-tomcat-9.0.99'
2525
profile::tomcat::java_home: '/usr/java/jdk-11.0.2+9-jre' #'/usr/java/jdk-11.0.2+9'
2626
profile::tomcat::https_enabled: 'true'
2727
profile::tomcat::keystorepass_hide: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnlEKcY7Uu8csd/lA6f9TKaYFyoYhF4nOZUZKexwBeug8l/VAKUOfFAWsiLNL+xtahjczN28cndjKYH1fOvohLwkQMWlmVueNfTt4mZTGnnIwHiJk2F8YSu8A9+/x96/mIAtwWx6WNsF4I+wQtwlnZQ0/xG868vExIGSxZIN0Q2k8uOk/gNutzkmmcHLUz5ECRUiXRncs9JriuxqAWjFFqP5o1seX9WZGpKCz4mxIaFJ5XOvXPiYKwrVGrF5GaX259/a4ZXrQTXsJhw3h7RVb6DGfF/N6icCF6F/NslQ1GOsMxmHfXR+P+8sSik9V8nT8nYNR+Z/ZTTSrcjkJh918EjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBANLnFlJdPjuwEejpw/f48UgBDRrnR2AaNDlcwqsTSJvqvK]

data/site/po/role/yourls.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ profile::backups::source_dir: '/etc/nginx'
1616
profile::backups::find_days_old: '10'
1717
profile::yourls::yourls_db_user_hide: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASZbBApVJXgRzuLhKBG3PZRNWBX01UBHewffg9ItbMd6znp6zbnDl4uH4YTwoZ8j1QRTnKqu4GNnuq6vS0I9gKg1ISfEDXr3UoQkFfT43BzcZkA3Pg4p8M/rp4v8v/qGteIQeO/MjbPLY8hwhg8cwX7WfYS8er1mpTs+6QFJ11NGzC16laX48pXzuqBzAE0VECbvs2KqVZtrUWg1NGsuBgiHm9oqHQzLxvXF2Fy1P6S8c4FjC++rEKV0FBELOd3ygZWog+g2T8+F7P4KdoUuVSv8Q+uEQ6QCnG3ykJh3GaWk/FckqyTRpszYIo/54pr7rgLTTIC+IUWk69kK/Nt1RojA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD4GTNRthrUWR0MG3+GnXmzgBCZeEoYQBAczk2ZCA76aLeM]
1818
profile::yourls::yourls_db_pass_hide: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASynjN9IjfbsQIwyes3kZr+vhadn4e8ICnPtAPfROR9ipm+cYusa8IsYkkdAAz/bvkhgbPHvf+joabhfvIL4ZWjCOfatel4FWgMH95nyjfvdax5C4aBH70uyw2RmRTC9QPCO91yiCJBQ26OMnxFag0iM0PW7M5sqA79Lz6SU6JaerMcKvRq21baJVGPCm/jxiZ9TdgS4daSwjsQ3EfZZrWzbT+oeASU/NTCfwfg9xpFntqQN+ZNb4ovlrRUWNZzsmJeQFo+f4HyCChY1W5X9aVPuJqyZrCsJvU6F9vE5BVdIU9kkByvFKll4suLWBmiWJIsgs7P93AbHV/xkhqL/d1TBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCo/ep2tV2Q1a0xSxmgOyKqgDBq0hE/WREM3zVlXOe8yHmSe47FnDa8Zkmo68+6G/M4VHmvKyWJUYrYY731SCrZTw8=]
19-
profile::yourls::yourls_version: '1.9.2'
19+
profile::yourls::yourls_version: '1.10.2'
2020
profile::yourls::nginx_version: '1.22.1'
2121
mysql::server::root_password: "%{lookup('mariadb_root_pwd')}"
2222
# Cron job for Mysql DB backup

0 commit comments

Comments
 (0)