From a70c192920e3635084301d899a1cdeb28dc75a24 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 26 Mar 2024 17:09:24 -0400 Subject: [PATCH] portland-dev: Add server --- pillar/portland_dev.sls | 25 +++++++++++++++++++++++++ pillar/top.sls | 3 +++ salt-config/roster | 4 ++++ salt/portland.sls | 2 ++ 4 files changed, 34 insertions(+) create mode 100644 pillar/portland_dev.sls create mode 100644 salt/portland.sls diff --git a/pillar/portland_dev.sls b/pillar/portland_dev.sls new file mode 100644 index 00000000..afc4eba3 --- /dev/null +++ b/pillar/portland_dev.sls @@ -0,0 +1,25 @@ +network: + host_id: ocp26 + ipv4: 20.106.239.92 + +ntp: + - 0.us.pool.ntp.org + - 1.us.pool.ntp.org + - 2.us.pool.ntp.org + - 3.us.pool.ntp.org + +apache: + public_access: True + sites: + portland: + configuration: default + servername: portland-dev.open-contracting.org + +docker: + user: deployer + +postgres: + version: 16 + # Docker containers don't use localhost to connect to the host's PostgreSQL service. Public access is controlled using Azure's firewall. + public_access: True + configuration: False diff --git a/pillar/top.sls b/pillar/top.sls index 1ef89f4c..c5a4e276 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -50,6 +50,9 @@ base: - tinyproxy - kingfisher_main_maintenance + 'portland-dev': + - portland_dev + 'prometheus': - prometheus_server - private.smtp diff --git a/salt-config/roster b/salt-config/roster index fc5465c8..6c25ea1b 100644 --- a/salt-config/roster +++ b/salt-config/roster @@ -23,6 +23,10 @@ redmine: registry: host: ocp13.open-contracting.org port: 2223 +portland-dev: + host: ocp26.open-contracting.org + user: ocpadmin + sudo: true # ocp15 is bi.open-contracting.org diff --git a/salt/portland.sls b/salt/portland.sls new file mode 100644 index 00000000..7e861c3f --- /dev/null +++ b/salt/portland.sls @@ -0,0 +1,2 @@ +include: + - docker_apps