Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F24665891
D3991.id10356.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
10 KB
Referenced Files
None
Subscribers
None
D3991.id10356.diff
View Options
diff --git a/hotfixes/MariaDB.sls b/hotfixes/MariaDB.sls
--- a/hotfixes/MariaDB.sls
+++ b/hotfixes/MariaDB.sls
@@ -11,7 +11,7 @@
# Port for MariaDB 10.11 has been added in April 2023 and
# isn't currently available in quarterly.
#
-# The new cluster db-B needs it for proper Unicode collation.
+# The new cluster db-b needs it for proper Unicode collation.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% if salt['node.has_role']('dbserver-mysql') %}
diff --git a/pillar/mailserver/dovecot.sls b/pillar/mailserver/dovecot.sls
--- a/pillar/mailserver/dovecot.sls
+++ b/pillar/mailserver/dovecot.sls
@@ -7,6 +7,6 @@
dovecot_config:
db:
- service: db-A
+ service: db-a
database: mail
credential: dbserver/cluster-A/users/dovecot
diff --git a/pillar/mailserver/postfix.sls b/pillar/mailserver/postfix.sls
--- a/pillar/mailserver/postfix.sls
+++ b/pillar/mailserver/postfix.sls
@@ -7,6 +7,6 @@
postfix_config:
db:
- service: db-A
+ service: db-a
database: mail
credential: dbserver/cluster-A/users/postfix
diff --git a/pillar/mailserver/vimbadmin.sls b/pillar/mailserver/vimbadmin.sls
--- a/pillar/mailserver/vimbadmin.sls
+++ b/pillar/mailserver/vimbadmin.sls
@@ -7,7 +7,7 @@
vimbadmin_config:
db:
- service: db-A
+ service: db-a
database: mail
credential: dbserver/cluster-A/users/mailManagement
security: mailserver/security
diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -58,9 +58,9 @@
netmask: *intranought_netmask
gateway: 172.27.27.1
- db-A-001:
+ db-a-001:
forest: nasqueron-infra
- hostname: db-A-001.nasqueron.drake
+ hostname: db-a-001.nasqueron.drake
roles:
- dbserver-pgsql
zfs:
@@ -78,9 +78,9 @@
netmask: *intranought_netmask
gateway: 172.27.27.1
- db-B-001:
+ db-b-001:
forest: nasqueron-infra
- hostname: db-B-001.nasqueron.drake
+ hostname: db-b-001.nasqueron.drake
roles:
- dbserver-mysql
zfs:
diff --git a/pillar/paas/alkane/web-001/main.sls b/pillar/paas/alkane/web-001/main.sls
--- a/pillar/paas/alkane/web-001/main.sls
+++ b/pillar/paas/alkane/web-001/main.sls
@@ -7,7 +7,7 @@
web_aliases:
services:
- - &db-B 172.27.27.9
+ - &db-b 172.27.27.9
# -------------------------------------------------------------
# Domains we deploy
@@ -100,7 +100,7 @@
skipCreateUser: True
env:
MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
- DB_HOST: *db-B
+ DB_HOST: *db-b
DB_USER: saas-mediawiki
php_values:
upload_max_filesize: 100M
@@ -173,7 +173,7 @@
/var/wwwroot/dereckson.be/www/.env:
user: web-be-dereckson-www
databases:
- - service: db-B
+ - service: db-b
credentials: dbserver/cluster-B/users/dereckson_www
# -------------------------------------------------------------
diff --git a/pillar/paas/alkane/web-001/zed.sls b/pillar/paas/alkane/web-001/zed.sls
--- a/pillar/paas/alkane/web-001/zed.sls
+++ b/pillar/paas/alkane/web-001/zed.sls
@@ -43,7 +43,7 @@
/var/wwwroot/hypership.space/www/.env:
user: web-space-hypership-www
databases:
- - service: db-B
+ - service: db-b
credentials: dbserver/cluster-B/users/zed
extra_values:
DB_NAME: zed_prod
diff --git a/pillar/paas/alkane/windriver/drive.sls b/pillar/paas/alkane/windriver/drive.sls
--- a/pillar/paas/alkane/windriver/drive.sls
+++ b/pillar/paas/alkane/windriver/drive.sls
@@ -8,7 +8,7 @@
web_aliases:
services:
- - &db-B 172.27.27.9
+ - &db-b 172.27.27.9
# -------------------------------------------------------------
# PHP sites
@@ -30,7 +30,7 @@
opcache.jit_buffer_size: 128M
env:
- DB_HOST: *db-B
+ DB_HOST: *db-b
DB_NAME: nextcloud_windriver
# Per NextCloud documentation
diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls
--- a/pillar/paas/alkane/windriver/main.sls
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -7,7 +7,7 @@
web_aliases:
services:
- - &db-B 172.27.27.9
+ - &db-b 172.27.27.9
# -------------------------------------------------------------
# Domains we deploy
@@ -135,5 +135,5 @@
/var/51-wwwroot/dereckson-www/.env:
user: web-be-dereckson-www51
databases:
- - service: db-B
+ - service: db-b
credentials: dbserver/cluster-B/users/dereckson_www51
diff --git a/pillar/paas/alkane/windriver/obsidian.sls b/pillar/paas/alkane/windriver/obsidian.sls
--- a/pillar/paas/alkane/windriver/obsidian.sls
+++ b/pillar/paas/alkane/windriver/obsidian.sls
@@ -35,9 +35,9 @@
/var/51-wwwroot/obsidian/.env:
user: web-org-nasqueron-obsidian51
databases:
- - service: db-B
+ - service: db-b
credentials: dbserver/cluster-B/users/obsidian51
- - service: db-A
+ - service: db-a
credentials: dbserver/cluster-A/users/obsidian
prefix: ORBEON_
extra_values:
diff --git a/pillar/paas/alkane/windriver/wolfplex_mag.sls b/pillar/paas/alkane/windriver/wolfplex_mag.sls
--- a/pillar/paas/alkane/windriver/wolfplex_mag.sls
+++ b/pillar/paas/alkane/windriver/wolfplex_mag.sls
@@ -8,7 +8,7 @@
web_aliases:
services:
- - &db-B 172.27.27.9
+ - &db-b 172.27.27.9
# -------------------------------------------------------------
# PHP sites
@@ -23,5 +23,5 @@
user: web-org-wolfplex-zine
php-fpm: prod
env:
- DB_HOST: *db-B
+ DB_HOST: *db-b
DB_NAME: wolfplex_zine
diff --git a/pillar/paas/docker/dwellers/airflow.sls b/pillar/paas/docker/dwellers/airflow.sls
--- a/pillar/paas/docker/dwellers/airflow.sls
+++ b/pillar/paas/docker/dwellers/airflow.sls
@@ -52,7 +52,7 @@
network: airflow
services:
redis: airflow_redis
- postgresql: 172.27.27.8 # db-A-001.nasqueron.drake
+ postgresql: 172.27.27.8 # db-a-001.nasqueron.drake
credentials:
admin_account: nasqueron/airflow/admin_account
fernet_key: nasqueron/airflow/fernet
diff --git a/pillar/paas/docker/dwellers/orbeon.sls b/pillar/paas/docker/dwellers/orbeon.sls
--- a/pillar/paas/docker/dwellers/orbeon.sls
+++ b/pillar/paas/docker/dwellers/orbeon.sls
@@ -26,7 +26,7 @@
app_port: 16080
network: orbeon
db:
- service: db-A
+ service: db-a
database: forms
credential: dbserver/cluster-A/users/orbeon
secret_key: nasqueron/orbeon/oxf.crypto.password
diff --git a/pillar/saas/wordpress.sls b/pillar/saas/wordpress.sls
--- a/pillar/saas/wordpress.sls
+++ b/pillar/saas/wordpress.sls
@@ -12,7 +12,7 @@
dereckson:
user: web-be-dereckson-www
db:
- service: db-B
+ service: db-b
credentials: dbserver/cluster-B/users/dereckson_blog
name: Dereckson_Blog
secrets: dereckson/wordpress/secrets
diff --git a/pillar/services/table.sls b/pillar/services/table.sls
--- a/pillar/services/table.sls
+++ b/pillar/services/table.sls
@@ -30,8 +30,8 @@
- 172.27.27.35 # windriver
# Databases
- db-A: 172.27.27.8
- db-B: 172.27.27.9
+ db-a: 172.27.27.8
+ db-b: 172.27.27.9
# Mail
mail:
@@ -59,7 +59,7 @@
- 172.27.27.4 # dwellers
- 172.27.27.5 # docker-002
- 172.27.27.7 # complector
- - 172.27.27.8 # db-A-001
- - 172.27.27.9 # db-B-001
+ - 172.27.27.8 # db-a-001
+ - 172.27.27.9 # db-b-001
- 172.27.27.10 # web-001
- 172.27.27.35 # windriver
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -36,10 +36,10 @@
- saas.jenkins
- saas.phpbb
- db-A-001:
+ db-a-001:
- dbserver.cluster-A
- db-B-001:
+ db-b-001:
- dbserver.cluster-B
dwellers:
diff --git a/roles/core/motd/files/db-A-001 b/roles/core/motd/files/db-a-001
rename from roles/core/motd/files/db-A-001
rename to roles/core/motd/files/db-a-001
--- a/roles/core/motd/files/db-A-001
+++ b/roles/core/motd/files/db-a-001
@@ -1,5 +1,5 @@
____ ______ ___
- / )/ \/ \ db-A-001.nasqueron.drake
+ / )/ \/ \ db-a-001.nasqueron.drake
( / __ _\ )
\ (/ o) ( o) ) IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
\_ (_ ) \ ) / GW: {{ ipv4_gateway.ljust(16) }} Cluster A | PostgreSQL
diff --git a/roles/core/motd/files/db-B-001 b/roles/core/motd/files/db-b-001
rename from roles/core/motd/files/db-B-001
rename to roles/core/motd/files/db-b-001
--- a/roles/core/motd/files/db-B-001
+++ b/roles/core/motd/files/db-b-001
@@ -1,5 +1,5 @@
____
- .-' `'. db-B-001.nasqueron.drake
+ .-' `'. db-b-001.nasqueron.drake
/ _ _\
| ,_(o\ /o)_ IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
| \` - " - / GW: {{ ipv4_gateway.ljust(16) }} Cluster B | MySQL
diff --git a/roles/core/motd/files/ysul b/roles/core/motd/files/ysul
--- a/roles/core/motd/files/ysul
+++ b/roles/core/motd/files/ysul
@@ -10,5 +10,5 @@
be held in the utmost suspicion.” -- The Algebraist.
NEWS:
2023-05-18 Ysul is end-of-life. Services are migrated to web-001,
- WindRiver, db-B-001 - https://devcentral.nasqueron.org/T1803
+ WindRiver, db-b-001 - https://devcentral.nasqueron.org/T1803
__________________________________________________________________________
diff --git a/roles/viperserv/eggdrop/config.sls b/roles/viperserv/eggdrop/config.sls
--- a/roles/viperserv/eggdrop/config.sls
+++ b/roles/viperserv/eggdrop/config.sls
@@ -64,7 +64,7 @@
- context:
# Database is on cluster B
db:
- host: {{ pillar["nasqueron_services"]["db-B"] }}
+ host: {{ pillar["nasqueron_services"]["db-b"] }}
database: Nasqueron
vault:
approle: {{ salt['credentials.read_secret']('nasqueron/viperserv/vault') }}
diff --git a/top.sls b/top.sls
--- a/top.sls
+++ b/top.sls
@@ -37,9 +37,9 @@
- roles/webserver-core
'cloudhugger':
- roles/opensearch
- 'db-A-001':
+ 'db-a-001':
- roles/dbserver-pgsql
- 'db-B-001':
+ 'db-b-001':
- roles/dbserver-mysql
'dns-001':
- roles/dns
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 5, 03:24 (11 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3495924
Default Alt Text
D3991.id10356.diff (10 KB)
Attached To
Mode
D3991: Change db-A-001 to db-a-001 and db-B-001 to db-b-001 on all files
Attached
Detach File
Event Timeline
Log In to Comment