Skip to content

Commit

Permalink
Merge pull request #18 from NethServer:pgadmin
Browse files Browse the repository at this point in the history
Update PostgreSQL server configuration
  • Loading branch information
stephdl authored Sep 8, 2024
2 parents ba93925 + 92300c1 commit 9c9550b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 14 deletions.
26 changes: 15 additions & 11 deletions imageroot/state/config_server.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"Servers": {
"1": {
"Name": "Localhost Server",
"Group": "Localhost server",
"Port": 5432,
"Username": "postgres",
"Host": "/var/run/postgresql/",
"MaintenanceDB": "postgres",
"PassFile": ""
}
"Servers": {
"1": {
"Name": "postgresql",
"Group": "Servers",
"Host": "/var/run/postgresql/",
"Port": 5432,
"MaintenanceDB": "postgres",
"Username": "postgres",
"TunnelPort": "22",
"KerberosAuthentication": false,
"ConnectionParameters": {
"passfile": "../../pgpass"
}
}
}
}
}
1 change: 1 addition & 0 deletions imageroot/state/pgpass
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
127.0.0.1
2 changes: 2 additions & 0 deletions imageroot/systemd/user/pgadmin-app.service
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/pgadmin-app.pid \
--env-file=%S/state/smarthost.env \
${PGADMIN4_IMAGE}
ExecStartPost=/usr/bin/bash -c "while ! podman exec pgadmin-app /venv/bin/python3 setup.py get-users ; do sleep 5 ; done"
ExecStartPost=/usr/bin/podman cp pgpass pgadmin-app:/var/lib/pgadmin/pgpass
ExecStartPost=/usr/bin/podman exec pgadmin-app chmod 0600 /var/lib/pgadmin/pgpass
ExecStartPost=/usr/bin/podman exec pgadmin-app /venv/bin/python3 setup.py load-servers config_server.json --replace --user [email protected]
ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pgadmin-app.ctr-id -t 10
ExecReload=/usr/bin/podman kill -s HUP pgadmin-app
Expand Down
6 changes: 3 additions & 3 deletions ui/public/i18n/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"advanced": "Advanced",
"configuring": "Configuring",
"instance_configuration": "Configure postgresql",
"tcp_port_pgsql": "TCP port for postgresql",
"tcp_port_pgsql_tcp_port_tips": "TCP port restricted to the node localhost",
"tcp_port_pgsql": "PostgreSQL Connection TCP Port",
"tcp_port_pgsql_tcp_port_tips": "The TCP port is restricted to the cluster network, meaning it is not open to the public and can only be accessed from within the cluster with the internal wiregard IP for example 10.5.4.1",
"domain_already_used_in_traefik": "Domain already used in traefik",
"host_pattern": "Must be a valid fully qualified domain name",
"host_format": "Must be a valid fully qualified domain name",
"password_tips":"Default login and password are '[email protected]' and 'Nethesis,1234', change them as soon as possible"
"password_tips": "Default login and password are '[email protected]' and 'Nethesis,1234', change them as soon as possible"
},
"about": {
"title": "About"
Expand Down

0 comments on commit 9c9550b

Please sign in to comment.