Page MenuHomeSoftware Heritage
Files F9346121

D5402.id19336.diff
No OneTemporary
Actions

D5402.id19336.diff
View Options

diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2094,7 +2094,7 @@
secret_key: "%{hiera('swh::deploy::webapp::conf::secret_key')}"
content_display_max_size: 1048576
throttling: "%{alias('swh::deploy::webapp::config::throttling')}"
- production_db: "%{hiera('swh::deploy::webapp::production_db')}"
+ production_db: "%{alias('swh::deploy::webapp::production_db')}"
es_workers_index_url: "%{alias('swh::deploy::webapp::config::es_workers_index_url')}"
deposit:
private_api_url: "%{hiera('swh::deploy::webapp::deposit::private::url')}"
diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -327,3 +327,10 @@
swh::deploy::vault::e2e::webapp: "https://webapp.staging.swh.network"
swh::config::keycloak::realm_name: SoftwareHeritageStaging
+
+swh::deploy::webapp::production_db:
+ host: "%{alias('swh::deploy::webapp::db::host')}"
+ port: "%{alias('swh::deploy::db::pgbouncer::port')}"
+ name: "%{alias('swh::deploy::webapp::db::name')}"
+ user: "%{alias('swh::deploy::webapp::db::user')}"
+ password: "%{alias('swh::deploy::webapp::db::password')}"
diff --git a/site-modules/profile/manifests/swh/deploy/webapp.pp b/site-modules/profile/manifests/swh/deploy/webapp.pp
--- a/site-modules/profile/manifests/swh/deploy/webapp.pp
+++ b/site-modules/profile/manifests/swh/deploy/webapp.pp
@@ -39,9 +39,6 @@
# Note that it's required by the ::profile::swh::deploy::webapp::icinga_checks
$vhost_ssl_port = lookup('apache::https_port')
- $production_db_dir = lookup('swh::deploy::webapp::production_db_dir')
- $production_db_file = lookup('swh::deploy::webapp::production_db')
-
$locked_endpoints = lookup('swh::deploy::webapp::locked_endpoints', Array, 'unique')
$endpoint_directories = $locked_endpoints.map |$endpoint| {
@@ -105,20 +102,6 @@
include ::profile::swh::deploy::storage_cassandra
}
- file {$production_db_dir:
- ensure => directory,
- owner => $user,
- group => $group,
- mode => '0755',
- }
-
- file {$production_db_file:
- ensure => present,
- owner => $user,
- group => $group,
- mode => '0664',
- }
-
$sentry_dsn = lookup('swh::deploy::webapp::sentry_dsn', Optional[String], 'first', undef)
$sentry_environment = lookup('swh::deploy::webapp::sentry_environment', Optional[String], 'first', undef)
$sentry_swh_package = lookup('swh::deploy::webapp::sentry_swh_package', Optional[String], 'first', undef)

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 3, 3:44 PM (2 w, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3219124

Event Timeline

About · Developer information · Legal