diff --git a/manifests/site.pp b/manifests/site.pp index 9bc26c16..5d7fadcb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,120 +1,119 @@ node 'louvre.softwareheritage.org' { include role::swh_hypervisor_master } node 'beaubourg.softwareheritage.org', 'orsay.softwareheritage.org', 'hypervisor3.softwareheritage.org' { include role::swh_hypervisor } node 'pergamon.softwareheritage.org' { include role::swh_sysadmin } node 'tate.softwareheritage.org' { include role::swh_forge } node 'moma.softwareheritage.org' { include role::swh_api - include role::swh_apache_log_archiver } node 'webapp0.softwareheritage.org' { include role::swh_api_azure } node 'saatchi.internal.softwareheritage.org' { include role::swh_scheduler } node /^(prado|somerset).(internal.)?softwareheritage.org$/ { include role::swh_database } node 'banco.softwareheritage.org' { include role::swh_backup } node 'esnode1.internal.softwareheritage.org', 'esnode2.internal.softwareheritage.org', 'esnode3.internal.softwareheritage.org' { include role::swh_elasticsearch } node /^(unibo-test|orangeriedev).(internal.)?softwareheritage.org$/ { include role::swh_vault_test } node /^(unibo-prod|orangerie).(internal.)?softwareheritage.org$/ { include role::swh_vault } node /^(uffizi|storage\d+\.[^.]+\.azure).(internal.)?softwareheritage.org$/ { include role::swh_storage } node /^getty.(internal.)?softwareheritage.org$/ { include role::swh_eventlog } node /^worker\d+\.(internal\.)?softwareheritage\.org$/ { include role::swh_worker_inria } node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ { include role::swh_worker_azure } node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ { include role::swh_database } node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_osd } node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_mon } node /^ns\d+\.(.*\.azure\.)?internal\.softwareheritage\.org/ { include role::swh_nameserver_secondary } node 'thyssen.internal.softwareheritage.org' { include role::swh_ci_server } node /^jenkins-debian\d+\.internal\.softwareheritage\.org$/ { include role::swh_ci_agent_debian } node 'logstash0.internal.softwareheritage.org' { include role::swh_logstash_instance } node 'kibana0.internal.softwareheritage.org' { include role::swh_kibana_instance } node 'munin0.internal.softwareheritage.org' { include role::swh_munin_master } node 'giverny.softwareheritage.org', 'petit-palais.softwareheritage.org', 'grand-palais.softwareheritage.org', 'ddouard-desktop.internal.softwareheritage.org' { include role::swh_desktop } node default { include role::swh_base include profile::puppet::agent } diff --git a/site-modules/role/manifests/swh_apache_log_archiver.pp b/site-modules/role/manifests/swh_apache_log_archiver.pp deleted file mode 100644 index 79369ec0..00000000 --- a/site-modules/role/manifests/swh_apache_log_archiver.pp +++ /dev/null @@ -1,4 +0,0 @@ -class role::swh_apache_log_archiver inherits role::swh_base { - include profile::puppet::agent - include profile::filebeat -} diff --git a/site-modules/role/manifests/swh_api.pp b/site-modules/role/manifests/swh_api.pp index e8ea13c8..01bce4ee 100644 --- a/site-modules/role/manifests/swh_api.pp +++ b/site-modules/role/manifests/swh_api.pp @@ -1,10 +1,13 @@ class role::swh_api inherits role::swh_server { include profile::network include profile::puppet::agent # Web UI include profile::memcached include profile::swh::deploy::storage include profile::swh::deploy::webapp include profile::swh::deploy::deposit + + # Apache logs + include profile::filebeat } diff --git a/site-modules/role/manifests/swh_api_azure.pp b/site-modules/role/manifests/swh_api_azure.pp index a0735a5a..d98cf60d 100644 --- a/site-modules/role/manifests/swh_api_azure.pp +++ b/site-modules/role/manifests/swh_api_azure.pp @@ -1,12 +1,15 @@ # expansion of role::swh_api # -network: incompatible with Azure infrastructure # -deposit: not need for it class role::swh_api_azure inherits role::swh_server { include profile::puppet::agent # Web UI include profile::memcached include profile::swh::deploy::storage include profile::swh::deploy::webapp + + # Apache logs + include profile::filebeat }