From 1eeffe29c0dfe662fbb16263641ef71daae0202f Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Wed, 1 Dec 2021 15:59:47 +0000 Subject: [PATCH 1/4] Remove Mailu PostgreSQL. Make roundcube database configurable via setup. Fix #1838. --- docs/database.rst | 9 +- optional/postgresql/Dockerfile | 39 -- optional/postgresql/basebackup.sh | 28 - optional/postgresql/conf/pg_hba.conf | 91 ---- optional/postgresql/conf/pg_ident.conf | 44 -- optional/postgresql/conf/postgresql.conf | 658 ----------------------- optional/postgresql/conf/queries.sql | 42 -- optional/postgresql/postgres_crontab | 1 - optional/postgresql/start.py | 65 --- setup/README.md | 10 +- setup/flavors/compose/docker-compose.yml | 12 +- setup/flavors/compose/mailu.env | 9 +- setup/flavors/stack/docker-compose.yml | 10 - setup/static/render.js | 107 ++-- setup/templates/steps/database.html | 48 +- tests/build.yml | 4 - 16 files changed, 71 insertions(+), 1106 deletions(-) delete mode 100644 optional/postgresql/Dockerfile delete mode 100755 optional/postgresql/basebackup.sh delete mode 100644 optional/postgresql/conf/pg_hba.conf delete mode 100644 optional/postgresql/conf/pg_ident.conf delete mode 100644 optional/postgresql/conf/postgresql.conf delete mode 100644 optional/postgresql/conf/queries.sql delete mode 100644 optional/postgresql/postgres_crontab delete mode 100755 optional/postgresql/start.py diff --git a/docs/database.rst b/docs/database.rst index d4199c73..86edcf9f 100644 --- a/docs/database.rst +++ b/docs/database.rst @@ -23,10 +23,6 @@ To switch to a different database back-end: Mailu has now been switched to the new database back-end. The Mailu configuration has also been migrated. -.. note:: - The setup configuration wizard (setup.mailu.io) only supports creating config files for the same database back-end. When creating new config files, select the desired database flavour in the setup and enter dummy values for roundcube. - In the generated mailu.env file, configure all ROUNDCUBE_DB_* environment variables to the old values. For SQLite you can remove all the ROUNDCUBE_DB_* values. - External MySQL/MariaDB ---------------------- @@ -209,8 +205,5 @@ Optionally you can remove left-over files which were used by the old database: - /mailu/data/psql_db (old database files) .. note:: - The setup configuration wizard (setup.mailu.io) only supports creating config files for the same database back-end. When creating new config files, select PostgreSQL in the setup and enter dummy values for roundcube. - In the generated mailu.env file, remove all ROUNDCUBE_DB_* environment variables. - Now Admin will use PostgreSQL and roundcube will keep using Roundcube. - Roundcube does not offer a migration tool for moving from SQLite to PostgreSQL. + In case roundcube is used, then in the setup utility SQLite can be chosen as database back end for roundcube. diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile deleted file mode 100644 index 3ddbb40a..00000000 --- a/optional/postgresql/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -ARG DISTRO=alpine:3.14.2 -FROM $DISTRO - -ENV TZ Etc/UTC - -# python3 shared with most images -RUN apk add --no-cache \ - python3 py3-pip bash py3-multidict tzdata \ - && pip3 install --upgrade pip - -# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube -RUN pip3 install socrate==0.2.0 - -# Image specific layers under this line -RUN apk add --no-cache \ - postgresql postgresql-libs busybox-suid sudo tar \ - && apk add --virtual .build-deps gcc musl-dev postgresql-dev python3-dev \ - && pip3 install psycopg2 anosql==0.3.1 \ - && apk --purge del .build-deps - -COPY start.py /start.py -COPY basebackup.sh /basebackup.sh -COPY conf /conf - -COPY postgres_crontab /etc/postgres_crontab -RUN crontab /etc/postgres_crontab - -ENV LANG en_US.UTF-8 - -RUN mkdir -p /data /backup /run/postgresql \ - && chown -R postgres:postgres /run/postgresql \ - && chmod 2777 /run/postgresql - -VOLUME /data -VOLUME /backup -EXPOSE 5432 - -CMD /start.py -HEALTHCHECK CMD psql -h 127.0.0.1 -d postgres -U health -c "select 1 as ok;" || exit 1 diff --git a/optional/postgresql/basebackup.sh b/optional/postgresql/basebackup.sh deleted file mode 100755 index 907da2ef..00000000 --- a/optional/postgresql/basebackup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -dest="/backup/base-$(date +%F-%H%M)" -last=$(ls -d /backup/base* | tail -n1) -mkdir $dest || exit $? - -pg_basebackup --wal-method=none --pgdata=$dest --format=tar --gzip --username=postgres || exit $? - -# Clean old base backups, keep the last and the current. -for d in /backup/base*; do - if [ "$d" == "$last" ] || [ "$d" == "$dest" ]; then - continue - fi - rm -r $d || exit $? -done - -# Clean the wall archive -cd /backup/wal_archive || exit $? -if [ $(ls *.*.backup | wc -l) -lt 2 ]; then - exit 0 -fi -# Find the single last wal.backup point -prev_wal_start="$(ls *.*.backup | tail -n2 | head -n1 | cut -d '.' -f 1)" -for f in $(ls) ; do - if [ "$f" \< "$prev_wal_start" ]; then - rm -v /backup/wal_archive/$f - fi -done diff --git a/optional/postgresql/conf/pg_hba.conf b/optional/postgresql/conf/pg_hba.conf deleted file mode 100644 index fdf82644..00000000 --- a/optional/postgresql/conf/pg_hba.conf +++ /dev/null @@ -1,91 +0,0 @@ -# PostgreSQL Client Authentication Configuration File -# =================================================== -# -# Refer to the "Client Authentication" section in the PostgreSQL -# documentation for a complete description of this file. A short -# synopsis follows. -# -# This file controls: which hosts are allowed to connect, how clients -# are authenticated, which PostgreSQL user names they can use, which -# databases they can access. Records take one of these forms: -# -# local DATABASE USER METHOD [OPTIONS] -# host DATABASE USER ADDRESS METHOD [OPTIONS] -# hostssl DATABASE USER ADDRESS METHOD [OPTIONS] -# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS] -# -# (The uppercase items must be replaced by actual values.) -# -# The first field is the connection type: "local" is a Unix-domain -# socket, "host" is either a plain or SSL-encrypted TCP/IP socket, -# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a -# plain TCP/IP socket. -# -# DATABASE can be "all", "sameuser", "samerole", "replication", a -# database name, or a comma-separated list thereof. The "all" -# keyword does not match "replication". Access to replication -# must be enabled in a separate record (see example below). -# -# USER can be "all", a user name, a group name prefixed with "+", or a -# comma-separated list thereof. In both the DATABASE and USER fields -# you can also write a file name prefixed with "@" to include names -# from a separate file. -# -# ADDRESS specifies the set of hosts the record matches. It can be a -# host name, or it is made up of an IP address and a CIDR mask that is -# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that -# specifies the number of significant bits in the mask. A host name -# that starts with a dot (.) matches a suffix of the actual host name. -# Alternatively, you can write an IP address and netmask in separate -# columns to specify the set of hosts. Instead of a CIDR-address, you -# can write "samehost" to match any of the server's own IP addresses, -# or "samenet" to match any address in any subnet that the server is -# directly connected to. -# -# METHOD can be "trust", "reject", "md5", "password", "scram-sha-256", -# "gss", "sspi", "ident", "peer", "pam", "ldap", "radius" or "cert". -# Note that "password" sends passwords in clear text; "md5" or -# "scram-sha-256" are preferred since they send encrypted passwords. -# -# OPTIONS are a set of options for the authentication in the format -# NAME=VALUE. The available options depend on the different -# authentication methods -- refer to the "Client Authentication" -# section in the documentation for a list of which options are -# available for which authentication methods. -# -# Database and user names containing spaces, commas, quotes and other -# special characters must be quoted. Quoting one of the keywords -# "all", "sameuser", "samerole" or "replication" makes the name lose -# its special character, and just match a database or username with -# that name. -# -# This file is read on server startup and when the server receives a -# SIGHUP signal. If you edit the file on a running system, you have to -# SIGHUP the server for the changes to take effect, run "pg_ctl reload", -# or execute "SELECT pg_reload_conf()". -# -# Put your actual configuration here -# ---------------------------------- -# -# If you want to allow non-local connections, you need to add more -# "host" records. In that case you will also need to make PostgreSQL -# listen on a non-local interface via the listen_addresses -# configuration parameter, or via the -i or -h command line switches. - - - -# TYPE DATABASE USER ADDRESS METHOD - -# "local" is for Unix domain socket connections only -local all all peer map=local -# IPv4 connections: -host mailu mailu {{ SUBNET }} md5 -host postgres health 127.0.0.1/32 trust -# IPv6 local connections: -host mailu mailu {{ SUBNET6|default('::1/128') }} md5 -host all all ::1/128 reject -# Allow replication connections from localhost, by a user with the -# replication privilege. -local replication all peer map=local -host replication all 127.0.0.1/32 reject -host replication all ::1/128 reject diff --git a/optional/postgresql/conf/pg_ident.conf b/optional/postgresql/conf/pg_ident.conf deleted file mode 100644 index 4538ff9c..00000000 --- a/optional/postgresql/conf/pg_ident.conf +++ /dev/null @@ -1,44 +0,0 @@ -# PostgreSQL User Name Maps -# ========================= -# -# Refer to the PostgreSQL documentation, chapter "Client -# Authentication" for a complete description. A short synopsis -# follows. -# -# This file controls PostgreSQL user name mapping. It maps external -# user names to their corresponding PostgreSQL user names. Records -# are of the form: -# -# MAPNAME SYSTEM-USERNAME PG-USERNAME -# -# (The uppercase quantities must be replaced by actual values.) -# -# MAPNAME is the (otherwise freely chosen) map name that was used in -# pg_hba.conf. SYSTEM-USERNAME is the detected user name of the -# client. PG-USERNAME is the requested PostgreSQL user name. The -# existence of a record specifies that SYSTEM-USERNAME may connect as -# PG-USERNAME. -# -# If SYSTEM-USERNAME starts with a slash (/), it will be treated as a -# regular expression. Optionally this can contain a capture (a -# parenthesized subexpression). The substring matching the capture -# will be substituted for \1 (backslash-one) if present in -# PG-USERNAME. -# -# Multiple maps may be specified in this file and used by pg_hba.conf. -# -# No map names are defined in the default configuration. If all -# system user names and PostgreSQL user names are the same, you don't -# need anything in this file. -# -# This file is read on server startup and when the postmaster receives -# a SIGHUP signal. If you edit the file on a running system, you have -# to SIGHUP the postmaster for the changes to take effect. You can -# use "pg_ctl reload" to do that. - -# Put your actual configuration here -# ---------------------------------- - -# MAPNAME SYSTEM-USERNAME PG-USERNAME -local postgres postgres -local root postgres diff --git a/optional/postgresql/conf/postgresql.conf b/optional/postgresql/conf/postgresql.conf deleted file mode 100644 index 97c5391f..00000000 --- a/optional/postgresql/conf/postgresql.conf +++ /dev/null @@ -1,658 +0,0 @@ -# ----------------------------- -# PostgreSQL configuration file -# ----------------------------- -# -# This file consists of lines of the form: -# -# name = value -# -# (The "=" is optional.) Whitespace may be used. Comments are introduced with -# "#" anywhere on a line. The complete list of parameter names and allowed -# values can be found in the PostgreSQL documentation. -# -# The commented-out settings shown in this file represent the default values. -# Re-commenting a setting is NOT sufficient to revert it to the default value; -# you need to reload the server. -# -# This file is read on server startup and when the server receives a SIGHUP -# signal. If you edit the file on a running system, you have to SIGHUP the -# server for the changes to take effect, run "pg_ctl reload", or execute -# "SELECT pg_reload_conf()". Some parameters, which are marked below, -# require a server shutdown and restart to take effect. -# -# Any parameter can also be given as a command-line option to the server, e.g., -# "postgres -c log_connections=on". Some parameters can be changed at run time -# with the "SET" SQL command. -# -# Memory units: kB = kilobytes Time units: ms = milliseconds -# MB = megabytes s = seconds -# GB = gigabytes min = minutes -# TB = terabytes h = hours -# d = days - - -#------------------------------------------------------------------------------ -# FILE LOCATIONS -#------------------------------------------------------------------------------ - -# The default values of these variables are driven from the -D command-line -# option or PGDATA environment variable, represented here as ConfigDir. - -#data_directory = 'ConfigDir' # use data in another directory - # (change requires restart) -#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file - # (change requires restart) -#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file - # (change requires restart) - -# If external_pid_file is not explicitly set, no extra PID file is written. -#external_pid_file = '' # write an extra PID file - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONNECTIONS AND AUTHENTICATION -#------------------------------------------------------------------------------ - -# - Connection Settings - - -listen_addresses = '*' # what IP address(es) to listen on; - # comma-separated list of addresses; - # defaults to 'localhost'; use '*' for all - # (change requires restart) -#port = 5432 # (change requires restart) -max_connections = 100 # (change requires restart) -#superuser_reserved_connections = 3 # (change requires restart) -unix_socket_directories = '/run/postgresql,/tmp' # comma-separated list of directories - # (change requires restart) -#unix_socket_group = '' # (change requires restart) -#unix_socket_permissions = 0777 # begin with 0 to use octal notation - # (change requires restart) -#bonjour = off # advertise server via Bonjour - # (change requires restart) -#bonjour_name = '' # defaults to the computer name - # (change requires restart) - -# - Security and Authentication - - -#authentication_timeout = 1min # 1s-600s -#ssl = off -#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers -#ssl_prefer_server_ciphers = on -#ssl_ecdh_curve = 'prime256v1' -#ssl_dh_params_file = '' -#ssl_cert_file = 'server.crt' -#ssl_key_file = 'server.key' -#ssl_ca_file = '' -#ssl_crl_file = '' -#password_encryption = md5 # md5 or scram-sha-256 -#db_user_namespace = off -#row_security = on - -# GSSAPI using Kerberos -#krb_server_keyfile = '' -#krb_caseins_users = off - -# - TCP Keepalives - -# see "man 7 tcp" for details - -#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; - # 0 selects the system default -#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; - # 0 selects the system default -#tcp_keepalives_count = 0 # TCP_KEEPCNT; - # 0 selects the system default - - -#------------------------------------------------------------------------------ -# RESOURCE USAGE (except WAL) -#------------------------------------------------------------------------------ - -# - Memory - - -shared_buffers = 128MB # min 128kB - # (change requires restart) -#huge_pages = try # on, off, or try - # (change requires restart) -#temp_buffers = 8MB # min 800kB -#max_prepared_transactions = 0 # zero disables the feature - # (change requires restart) -# Caution: it is not advisable to set max_prepared_transactions nonzero unless -# you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB -#maintenance_work_mem = 64MB # min 1MB -#replacement_sort_tuples = 150000 # limits use of replacement selection sort -#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem -#max_stack_depth = 2MB # min 100kB -dynamic_shared_memory_type = posix # the default is the first option - # supported by the operating system: - # posix - # sysv - # windows - # mmap - # use none to disable dynamic shared memory - # (change requires restart) - -# - Disk - - -#temp_file_limit = -1 # limits per-process temp file space - # in kB, or -1 for no limit - -# - Kernel Resource Usage - - -#max_files_per_process = 1000 # min 25 - # (change requires restart) -#shared_preload_libraries = '' # (change requires restart) - -# - Cost-Based Vacuum Delay - - -#vacuum_cost_delay = 0 # 0-100 milliseconds -#vacuum_cost_page_hit = 1 # 0-10000 credits -#vacuum_cost_page_miss = 10 # 0-10000 credits -#vacuum_cost_page_dirty = 20 # 0-10000 credits -#vacuum_cost_limit = 200 # 1-10000 credits - -# - Background Writer - - -#bgwriter_delay = 200ms # 10-10000ms between rounds -#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round -#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round -#bgwriter_flush_after = 512kB # measured in pages, 0 disables - -# - Asynchronous Behavior - - -#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching -#max_worker_processes = 8 # (change requires restart) -#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers -#max_parallel_workers = 8 # maximum number of max_worker_processes that - # can be used in parallel queries -#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate - # (change requires restart) -#backend_flush_after = 0 # measured in pages, 0 disables - - -#------------------------------------------------------------------------------ -# WRITE AHEAD LOG -#------------------------------------------------------------------------------ - -# - Settings - - -wal_level = replica # minimal, replica, or logical - # (change requires restart) -#fsync = on # flush data to disk for crash safety - # (turning this off can cause - # unrecoverable data corruption) -#synchronous_commit = on # synchronization level; - # off, local, remote_write, remote_apply, or on -#wal_sync_method = fsync # the default is the first option - # supported by the operating system: - # open_datasync - # fdatasync (default on Linux) - # fsync - # fsync_writethrough - # open_sync -#full_page_writes = on # recover from partial page writes -#wal_compression = off # enable compression of full-page writes -#wal_log_hints = off # also do full page writes of non-critical updates - # (change requires restart) -#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers - # (change requires restart) -#wal_writer_delay = 200ms # 1-10000 milliseconds -#wal_writer_flush_after = 1MB # measured in pages, 0 disables - -#commit_delay = 0 # range 0-100000, in microseconds -#commit_siblings = 5 # range 1-1000 - -# - Checkpoints - - -checkpoint_timeout = 60s # range 30s-1d -#max_wal_size = 1GB -#min_wal_size = 80MB -#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 -#checkpoint_flush_after = 256kB # measured in pages, 0 disables -checkpoint_warning = 15s # 0 disables - -# - Archiving - - -archive_mode = on # enables archiving; off, on, or always - # (change requires restart) -archive_command = 'test ! -f /backup/wal_archive/%f && gzip < %p > /backup/wal_archive/%f' # command to use to archive a logfile segment - # placeholders: %p = path of file to archive - # %f = file name only - # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' -archive_timeout = 60 # force a logfile segment switch after this - # number of seconds; 0 disables - - -#------------------------------------------------------------------------------ -# REPLICATION -#------------------------------------------------------------------------------ - -# - Sending Server(s) - - -# Set these on the master and on any standby that will send replication data. - -#max_wal_senders = 10 # max number of walsender processes - # (change requires restart) -#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables -#wal_sender_timeout = 60s # in milliseconds; 0 disables - -#max_replication_slots = 10 # max number of replication slots - # (change requires restart) -#track_commit_timestamp = off # collect timestamp of transaction commit - # (change requires restart) - -# - Master Server - - -# These settings are ignored on a standby server. - -#synchronous_standby_names = '' # standby servers that provide sync rep - # method to choose sync standbys, number of sync standbys, - # and comma-separated list of application_name - # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed - -# - Standby Servers - - -# These settings are ignored on a master server. - -#hot_standby = on # "off" disallows queries during recovery - # (change requires restart) -#max_standby_archive_delay = 30s # max delay before canceling queries - # when reading WAL from archive; - # -1 allows indefinite delay -#max_standby_streaming_delay = 30s # max delay before canceling queries - # when reading streaming WAL; - # -1 allows indefinite delay -#wal_receiver_status_interval = 10s # send replies at least this often - # 0 disables -#hot_standby_feedback = off # send info from standby to prevent - # query conflicts -#wal_receiver_timeout = 60s # time that receiver waits for - # communication from master - # in milliseconds; 0 disables -#wal_retrieve_retry_interval = 5s # time to wait before retrying to - # retrieve WAL after a failed attempt - -# - Subscribers - - -# These settings are ignored on a publisher. - -#max_logical_replication_workers = 4 # taken from max_worker_processes - # (change requires restart) -#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers - - -#------------------------------------------------------------------------------ -# QUERY TUNING -#------------------------------------------------------------------------------ - -# - Planner Method Configuration - - -#enable_bitmapscan = on -#enable_hashagg = on -#enable_hashjoin = on -#enable_indexscan = on -#enable_indexonlyscan = on -#enable_material = on -#enable_mergejoin = on -#enable_nestloop = on -#enable_seqscan = on -#enable_sort = on -#enable_tidscan = on - -# - Planner Cost Constants - - -#seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above -#cpu_tuple_cost = 0.01 # same scale as above -#cpu_index_tuple_cost = 0.005 # same scale as above -#cpu_operator_cost = 0.0025 # same scale as above -#parallel_tuple_cost = 0.1 # same scale as above -#parallel_setup_cost = 1000.0 # same scale as above -#min_parallel_table_scan_size = 8MB -#min_parallel_index_scan_size = 512kB -#effective_cache_size = 4GB - -# - Genetic Query Optimizer - - -#geqo = on -#geqo_threshold = 12 -#geqo_effort = 5 # range 1-10 -#geqo_pool_size = 0 # selects default based on effort -#geqo_generations = 0 # selects default based on effort -#geqo_selection_bias = 2.0 # range 1.5-2.0 -#geqo_seed = 0.0 # range 0.0-1.0 - -# - Other Planner Options - - -#default_statistics_target = 100 # range 1-10000 -#constraint_exclusion = partition # on, off, or partition -#cursor_tuple_fraction = 0.1 # range 0.0-1.0 -#from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit - # JOIN clauses -#force_parallel_mode = off - - -#------------------------------------------------------------------------------ -# ERROR REPORTING AND LOGGING -#------------------------------------------------------------------------------ - -# - Where to Log - - -#log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog, and eventlog, - # depending on platform. csvlog - # requires logging_collector to be on. - -# This is used when logging to stderr: -#logging_collector = off # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) - -# These are only used if logging_collector is on: -#log_directory = 'log' # directory where log files are written, - # can be absolute or relative to PGDATA -#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, - # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation -#log_truncate_on_rotation = off # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on - # time-driven rotation, not on restarts - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. -#log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. -#log_rotation_size = 10MB # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. - -# These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on -#syslog_split_messages = on - -# This is only relevant when logging to eventlog (win32): -# (change requires restart) -#event_source = 'PostgreSQL' - -# - When to Log - - -#client_min_messages = notice # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # log - # notice - # warning - # error - -#log_min_messages = warning # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic - -#log_min_error_statement = error # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic (effectively off) - -#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, > 0 logs only - # statements running at least this number - # of milliseconds - - -# - What to Log - - -#debug_print_parse = off -#debug_print_rewritten = off -#debug_print_plan = off -#debug_pretty_print = on -#log_checkpoints = off -#log_connections = off -#log_disconnections = off -#log_duration = off -#log_error_verbosity = default # terse, default, or verbose messages -#log_hostname = off -#log_line_prefix = '%m [%p] ' # special values: - # %a = application name - # %u = user name - # %d = database name - # %r = remote host and port - # %h = remote host - # %p = process ID - # %t = timestamp without milliseconds - # %m = timestamp with milliseconds - # %n = timestamp with milliseconds (as a Unix epoch) - # %i = command tag - # %e = SQL state - # %c = session ID - # %l = session line number - # %s = session start timestamp - # %v = virtual transaction ID - # %x = transaction ID (0 if none) - # %q = stop here in non-session - # processes - # %% = '%' - # e.g. '<%u%%%d> ' -#log_lock_waits = off # log lock waits >= deadlock_timeout -#log_statement = 'none' # none, ddl, mod, all -#log_replication_commands = off -#log_temp_files = -1 # log temporary files equal or larger - # than the specified size in kilobytes; - # -1 disables, 0 logs all temp files -log_timezone = 'UTC' - - -# - Process Title - - -#cluster_name = '' # added to process titles if nonempty - # (change requires restart) -#update_process_title = on - - -#------------------------------------------------------------------------------ -# RUNTIME STATISTICS -#------------------------------------------------------------------------------ - -# - Query/Index Statistics Collector - - -#track_activities = on -#track_counts = on -#track_io_timing = off -#track_functions = none # none, pl, all -#track_activity_query_size = 1024 # (change requires restart) -#stats_temp_directory = 'pg_stat_tmp' - - -# - Statistics Monitoring - - -#log_parser_stats = off -#log_planner_stats = off -#log_executor_stats = off -#log_statement_stats = off - - -#------------------------------------------------------------------------------ -# AUTOVACUUM PARAMETERS -#------------------------------------------------------------------------------ - -#autovacuum = on # Enable autovacuum subprocess? 'on' - # requires track_counts to also be on. -#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and - # their durations, > 0 logs only - # actions running at least this number - # of milliseconds. -#autovacuum_max_workers = 3 # max number of autovacuum subprocesses - # (change requires restart) -#autovacuum_naptime = 1min # time between autovacuum runs -#autovacuum_vacuum_threshold = 50 # min number of row updates before - # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before - # analyze -#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum -#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze -#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum - # (change requires restart) -#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age - # before forced vacuum - # (change requires restart) -#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for - # autovacuum, in milliseconds; - # -1 means use vacuum_cost_delay -#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for - # autovacuum, -1 means use - # vacuum_cost_limit - - -#------------------------------------------------------------------------------ -# CLIENT CONNECTION DEFAULTS -#------------------------------------------------------------------------------ - -# - Statement Behavior - - -#search_path = '"$user", public' # schema names -#default_tablespace = '' # a tablespace name, '' uses the default -#temp_tablespaces = '' # a list of tablespace names, '' uses - # only default tablespace -#check_function_bodies = on -#default_transaction_isolation = 'read committed' -#default_transaction_read_only = off -#default_transaction_deferrable = off -#session_replication_role = 'origin' -#statement_timeout = 0 # in milliseconds, 0 is disabled -#lock_timeout = 0 # in milliseconds, 0 is disabled -#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled -#vacuum_freeze_min_age = 50000000 -#vacuum_freeze_table_age = 150000000 -#vacuum_multixact_freeze_min_age = 5000000 -#vacuum_multixact_freeze_table_age = 150000000 -#bytea_output = 'hex' # hex, escape -#xmlbinary = 'base64' -#xmloption = 'content' -#gin_fuzzy_search_limit = 0 -#gin_pending_list_limit = 4MB - -# - Locale and Formatting - - -datestyle = 'iso, mdy' -#intervalstyle = 'postgres' -timezone = 'UTC' -#timezone_abbreviations = 'Default' # Select the set of available time zone - # abbreviations. Currently, there are - # Default - # Australia (historical usage) - # India - # You can create your own file in - # share/timezonesets/. -#extra_float_digits = 0 # min -15, max 3 -#client_encoding = sql_ascii # actually, defaults to database - # encoding - -# These settings are initialized by initdb, but they can be changed. -lc_messages = 'C' # locale for system error message - # strings -lc_monetary = 'C' # locale for monetary formatting -lc_numeric = 'C' # locale for number formatting -lc_time = 'C' # locale for time formatting - -# default configuration for text search -default_text_search_config = 'pg_catalog.english' - -# - Other Defaults - - -#dynamic_library_path = '$libdir' -#local_preload_libraries = '' -#session_preload_libraries = '' - - -#------------------------------------------------------------------------------ -# LOCK MANAGEMENT -#------------------------------------------------------------------------------ - -#deadlock_timeout = 1s -#max_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_relation = -2 # negative values mean - # (max_pred_locks_per_transaction - # / -max_pred_locks_per_relation) - 1 -#max_pred_locks_per_page = 2 # min 0 - - -#------------------------------------------------------------------------------ -# VERSION/PLATFORM COMPATIBILITY -#------------------------------------------------------------------------------ - -# - Previous PostgreSQL Versions - - -#array_nulls = on -#backslash_quote = safe_encoding # on, off, or safe_encoding -#default_with_oids = off -#escape_string_warning = on -#lo_compat_privileges = off -#operator_precedence_warning = off -#quote_all_identifiers = off -#standard_conforming_strings = on -#synchronize_seqscans = on - -# - Other Platforms and Clients - - -#transform_null_equals = off - - -#------------------------------------------------------------------------------ -# ERROR HANDLING -#------------------------------------------------------------------------------ - -#exit_on_error = off # terminate session on any error? -#restart_after_crash = on # reinitialize after backend crash? - - -#------------------------------------------------------------------------------ -# CONFIG FILE INCLUDES -#------------------------------------------------------------------------------ - -# These options allow settings to be loaded from files other than the -# default postgresql.conf. - -#include_dir = 'conf.d' # include files ending in '.conf' from - # directory 'conf.d' -#include_if_exists = 'exists.conf' # include file only if it exists -#include = 'special.conf' # include file - - -#------------------------------------------------------------------------------ -# CUSTOMIZED OPTIONS -#------------------------------------------------------------------------------ - -# Add settings for extensions here diff --git a/optional/postgresql/conf/queries.sql b/optional/postgresql/conf/queries.sql deleted file mode 100644 index 4ed9c58d..00000000 --- a/optional/postgresql/conf/queries.sql +++ /dev/null @@ -1,42 +0,0 @@ --- name: create_mailu_user! --- Create the mailu user if it does not exist. -do $$ -begin - create user mailu; - exception when others then - raise notice 'mailu user not created -- already exists'; -end -$$; - --- name: create_health_user! --- Create the mailu user if it does not exist. -do $$ -begin - create user health; - exception when others then - raise notice 'health user not created -- already exists'; -end -$$; - --- name: grant_health! --- Grant connect permission for the health user -grant connect - on database postgres - to health; - --- name: update_pw! -alter - user mailu - password :pw; - --- name: check_db --- check if the mailu db exists -select 1 - from pg_database - where datname = 'mailu'; - --- name: create_db! --- create the mailu db -create - database mailu - owner mailu; diff --git a/optional/postgresql/postgres_crontab b/optional/postgresql/postgres_crontab deleted file mode 100644 index ce87e1e2..00000000 --- a/optional/postgresql/postgres_crontab +++ /dev/null @@ -1 +0,0 @@ -11 4 * * 7 /basebackup.sh > /proc/1/fd/1 2>/proc/1/fd/2 diff --git a/optional/postgresql/start.py b/optional/postgresql/start.py deleted file mode 100755 index e34e157e..00000000 --- a/optional/postgresql/start.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/python3 - -import anosql -import psycopg2 -import glob -import os -import subprocess -from socrate import conf - -def setup(): - conn = psycopg2.connect(user='postgres') - queries = anosql.load_queries('postgres', '/conf/queries.sql') - # Mailu user - queries.create_mailu_user(conn) - queries.update_pw(conn, pw=os.environ.get("DB_PW")) - # Healthcheck user - queries.create_health_user(conn) - queries.grant_health(conn) - conn.commit() - # create db cannot be atomic. But this script is the only active connection, this is kinda safe. - if not queries.check_db(conn): - conn.set_isolation_level(0) - queries.create_db(conn) - conn.set_isolation_level(1) - conn.close() - -# Check if /data is empty -if not os.listdir("/data"): - os.system("chown -R postgres:postgres /data") - os.system("chmod 0700 /data") - base_backups=sorted(glob.glob("/backup/base-*")) - if base_backups: - # Restore the latest backup - subprocess.call(["tar", "--same-owner", "-zpxf", base_backups[-1] + "/base.tar.gz" , "-C", "/data"]) - if os.listdir("/backup/wal_archive"): - with open("/data/recovery.conf", "w") as rec: - rec.write("restore_command = 'gunzip < /backup/wal_archive/%f > %p'\n") - rec.write("standby_mode = off\n") - os.system("chown postgres:postgres /data/recovery.conf") - else: - # Bootstrap the database - os.system("sudo -u postgres initdb -D /data") - -# Create backup directory structure, if it does not yet exist -os.system("mkdir -p /backup/wal_archive") -os.system("chown -R postgres:postgres /backup") - -# Render config files -for pg_file in glob.glob("/conf/*.conf"): - conf.jinja(pg_file, os.environ, os.path.join("/data", os.path.basename(pg_file))) - -# (Re)start postgresql locally for DB and user creation -os.system("sudo -u postgres pg_ctl start -D /data -o '-h \"''\" '") -while os.path.isfile("recovery.conf"): - pass -os.system("sudo -u postgres pg_ctl -D /data promote") -setup() -os.system("sudo -u postgres pg_ctl stop -m smart -w -D /data") - -out=open("/proc/1/fd/1", "w") -err=open("/proc/1/fd/2", "w") -# Run the cron deamon -subprocess.Popen(["crond", "-f"], stdout=out, stderr=err) -# Run postgresql service -os.system("sudo -u postgres postgres -D /data -h \*") diff --git a/setup/README.md b/setup/README.md index 24c9cfa2..500968bc 100644 --- a/setup/README.md +++ b/setup/README.md @@ -6,7 +6,7 @@ Until this point, the app is working as it follows: - after you choose your desired flavor it will iterare over the files in the flavor directory and building the page (`templates/steps/config.html is general for all flavors`) - when you complete all required fields and press "Setup Mailu" button it will redirect you to the setup page (`flavors/choosen-flavor/setup.html`) - + To add a new flavor you need to create a directory under `templates/steps/` in which you are adding actual steps. Eg: Adding a WIP step we'll create `templates/steps/kubernetes/wip.html` @@ -16,9 +16,9 @@ wip.html will start with ``` {% call macros.panel("info", "Step X - Work in progress") %} -``` +``` -and end with +and end with ``` {% endcall %} ``` @@ -29,9 +29,9 @@ In the example below the string entered in the input field is stored in the vari ``` -In order to user the variable furter you use it like `{{ var_test }}` +In order to use the variable furter you use it like `{{ var_test }}` -In the setup page (`flavors/kubernetes/setup.html`) you cand add steps by importing macros +In the setup page (`flavors/kubernetes/setup.html`) you can add steps by importing macros ``` {% import "macros.html" as macros %} diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml index 18a881b8..c36004fd 100644 --- a/setup/flavors/compose/docker-compose.yml +++ b/setup/flavors/compose/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: always volumes: - "{{ root }}/redis:/data" - + # Core services front: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{ version }}} @@ -151,16 +151,6 @@ services: - imap {% endif %} - {% if db_flavor == 'postgresql' and postgresql == 'internal' %} - database: - image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postgresql:${MAILU_VERSION:-{{ version }}} - restart: always - env_file: {{ env }} - volumes: - - "{{ root }}/data/psql_db:/data" - - "{{ root }}/data/psql_backup:/backup" - {% endif %} - networks: default: {% if ipv6_enabled %} diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index a8709ab3..ed7ecfdd 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -177,18 +177,15 @@ TZ=Etc/UTC # Database settings ################################### DB_FLAVOR={{ db_flavor }} -{% if db_flavor == 'postgresql' and postgresql == 'internal' %} -DB_PW={{ secret(16) }} -{% endif %} -{% if postgresql == 'external' or db_flavor == 'mysql' %} +{% if db_flavor == 'postgresql' or db_flavor == 'mysql' %} DB_USER={{ db_user }} DB_PW={{ db_pw }} DB_HOST={{ db_url }} DB_NAME={{ db_name }} {% endif %} -{% if (postgresql == 'external' or db_flavor == 'mysql') and webmail_type == 'roundcube' %} -ROUNDCUBE_DB_FLAVOR={{ db_flavor }} +{% if ((db_flavor_rc == 'postgresql' or db_flavor_rc == 'mysql')) and webmail_type == 'roundcube' %} +ROUNDCUBE_DB_FLAVOR={{ db_flavor_rc }} ROUNDCUBE_DB_USER={{ roundcube_db_user }} ROUNDCUBE_DB_PW={{ roundcube_db_pw }} ROUNDCUBE_DB_HOST={{ roundcube_db_url }} diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml index 0c744d7e..a9158882 100644 --- a/setup/flavors/stack/docker-compose.yml +++ b/setup/flavors/stack/docker-compose.yml @@ -129,16 +129,6 @@ services: disable: true {% endif %} - {% if db_flavor == 'postgresql' and postgresql == 'internal' %} - database: - image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-{{ version }}} - env_file: {{ env }} - volumes: - - "{{ root }}/data/psql_backup:/backup" - healthcheck: - disable: true - {% endif %} - networks: default: driver: overlay diff --git a/setup/static/render.js b/setup/static/render.js index 0a0a6675..7e36de0f 100644 --- a/setup/static/render.js +++ b/setup/static/render.js @@ -35,80 +35,57 @@ $(document).ready(function() { $(document).ready(function() { if ($("#database").val() == 'sqlite') { - $("#postgres_db").hide(); - } else if ($("#database").val() == 'postgresql') { - $("#postgres_db").show(); - } else if ($("#database").val() == 'mysql') { - $("#external_db").show(); - } - if ($('#external_psql').prop('checked')) { + $("#external_db").hide(); + } else if ($("#database").val() != 'sqlite') { $("#external_db").show(); } + + $("#webmail").click(function() { + if (this.value == 'roundcube') { + $("#db_flavor_rc_sel").show(); + } else { + $("#db_flavor_rc_sel").hide(); + $("#roundcube_db_user").prop('required',false); + $("#roundcube_db_pw").prop('required',false); + $("#roundcube_db_url").prop('required',false); + $("#roundcube_db_name").prop('required',false); + } + }); + $("#database").click(function() { if (this.value == 'sqlite') { - $("#postgres_db").hide(); $("#external_db").hide(); - } else if (this.value == 'postgresql') { - $("#postgres_db").show(); - $("#external_db").hide(); - $("#external_psql").prop('checked', true); - $("#external_db").show(); - $("#db_user").prop('required',true); - $("#db_pw").prop('required',true); - $("#db_url").prop('required',true); - $("#db_name").prop('required',true); - if ($("#webmail").val() == 'roundcube') { - $("#roundcube_external_db").show(); - $("#roundcube_db_user").prop('required',true); - $("#roundcube_db_pw").prop('required',true); - $("#roundcube_db_url").prop('required',true); - $("#roundcube_db_name").prop('required',true); - } - } else if (this.value == 'mysql') { - $("#postgres_db").hide(); - $("#external_db").show(); - $("#db_user").prop('required',true); - $("#db_pw").prop('required',true); - $("#db_url").prop('required',true); - $("#db_name").prop('required',true); - if ($("#webmail").val() == 'roundcube') { - $("#roundcube_external_db").show(); - $("#roundcube_db_user").prop('required',true); - $("#roundcube_db_pw").prop('required',true); - $("#roundcube_db_url").prop('required',true); - $("#roundcube_db_name").prop('required',true); - } - } - }); - $("#external_psql").change(function() { - if ($(this).is(":checked")) { - $("#external_db").show(); - $("#db_user").prop('required',true); - $("#db_pw").prop('required',true); - $("#db_url").prop('required',true); - $("#db_name").prop('required',true); - if ($("#webmail").val() == 'roundcube') { - $("#roundcube_external_db").show(); - $("#roundcube_db_user").prop('required',true); - $("#roundcube_db_pw").prop('required',true); - $("#roundcube_db_url").prop('required',true); - $("#roundcube_db_name").prop('required',true); - } - } else { - $("#external_db").hide(); - } - }); - $("#internal_psql").change(function() { - if ($(this).is(":checked")) { - $("#external_db").hide(); - $("#db_user").val(""); - $("#db_pw").val(""); - $("#db_url").val(""); - $("#db_name").val(""); $("#db_user").prop('required',false); $("#db_pw").prop('required',false); $("#db_url").prop('required',false); $("#db_name").prop('required',false); + $("#roundcube_db_user").prop('required',false); + $("#roundcube_db_pw").prop('required',false); + $("#roundcube_db_url").prop('required',false); + $("#roundcube_db_name").prop('required',false); + } else if (this.value != 'sqlite') { + $("#external_db").show(); + $("#db_user").prop('required',true); + $("#db_pw").prop('required',true); + $("#db_url").prop('required',true); + $("#db_name").prop('required',true); + } + }); + + $("#database_rc").click(function() { + if (this.value == 'sqlite'){ + $("#roundcube_external_db").hide(); + $("#roundcube_db_user").prop('required',false); + $("#roundcube_db_pw").prop('required',false); + $("#roundcube_db_url").prop('required',false); + $("#roundcube_db_name").prop('required',false); + } + if (this.value != 'sqlite' && $("#webmail").val() == 'roundcube') { + $("#roundcube_external_db").show(); + $("#roundcube_db_user").prop('required',true); + $("#roundcube_db_pw").prop('required',true); + $("#roundcube_db_url").prop('required',true); + $("#roundcube_db_name").prop('required',true); } }); }); diff --git a/setup/templates/steps/database.html b/setup/templates/steps/database.html index 0a2f94f3..82b6b0d2 100644 --- a/setup/templates/steps/database.html +++ b/setup/templates/steps/database.html @@ -8,25 +8,6 @@ {% endfor %} -

- diff --git a/tests/build.yml b/tests/build.yml index eda5550c..178cb02c 100644 --- a/tests/build.yml +++ b/tests/build.yml @@ -38,10 +38,6 @@ services: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-local} build: ../core/admin - postgresql: - image: ${DOCKER_ORG:-mailu}/postgresql:${MAILU_VERSION:-local} - build: ../optional/postgresql - roundcube: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-local} build: ../webmails/roundcube From 0d35c8d40af28ad3922d4f7cf2beca4385386c11 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Wed, 1 Dec 2021 16:13:28 +0000 Subject: [PATCH 2/4] Add newsfragment. --- towncrier/newsfragments/2069.feature | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 towncrier/newsfragments/2069.feature diff --git a/towncrier/newsfragments/2069.feature b/towncrier/newsfragments/2069.feature new file mode 100644 index 00000000..dfc5a1df --- /dev/null +++ b/towncrier/newsfragments/2069.feature @@ -0,0 +1,3 @@ +Remove Mailu PostgreSQL. It is fully deprecated. No images will be built anymore and it cannot be selected in the setup utility. +The roundcube database flavour (e.g. PostgreSQL or SQLite) can now be selected indepently of the Mailu (Admin) database flavour. +Fix bug #1838. From 9eba2feae2053d7a8c64a8b569edfe248c4cd58c Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Wed, 1 Dec 2021 16:26:44 +0000 Subject: [PATCH 3/4] Remove Mailu PostgreSQL from CI.yml. --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dba30722..9b3e656e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -80,7 +80,7 @@ jobs: DOCKER_ORG: ${{ env.DOCKER_ORG }} run: docker-compose -f tests/build.yml build - name: Save all docker images - run: docker save ${{ env.DOCKER_ORG }}/admin ${{ env.DOCKER_ORG }}/clamav ${{ env.DOCKER_ORG }}/docs ${{ env.DOCKER_ORG }}/dovecot ${{ env.DOCKER_ORG }}/fetchmail ${{ env.DOCKER_ORG }}/nginx ${{ env.DOCKER_ORG }}/none ${{ env.DOCKER_ORG }}/postfix ${{ env.DOCKER_ORG }}/postgresql ${{ env.DOCKER_ORG }}/radicale ${{ env.DOCKER_ORG }}/rainloop ${{ env.DOCKER_ORG }}/roundcube ${{ env.DOCKER_ORG }}/rspamd ${{ env.DOCKER_ORG }}/setup ${{ env.DOCKER_ORG }}/traefik-certdumper ${{ env.DOCKER_ORG }}/unbound -o /images/images.tar.gz + run: docker save ${{ env.DOCKER_ORG }}/admin ${{ env.DOCKER_ORG }}/clamav ${{ env.DOCKER_ORG }}/docs ${{ env.DOCKER_ORG }}/dovecot ${{ env.DOCKER_ORG }}/fetchmail ${{ env.DOCKER_ORG }}/nginx ${{ env.DOCKER_ORG }}/none ${{ env.DOCKER_ORG }}/postfix ${{ env.DOCKER_ORG }}/radicale ${{ env.DOCKER_ORG }}/rainloop ${{ env.DOCKER_ORG }}/roundcube ${{ env.DOCKER_ORG }}/rspamd ${{ env.DOCKER_ORG }}/setup ${{ env.DOCKER_ORG }}/traefik-certdumper ${{ env.DOCKER_ORG }}/unbound -o /images/images.tar.gz test-core: name: Perform core tests From b62836ad7ea74b6ad0e2c9946e2d9305c66dba79 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Wed, 1 Dec 2021 20:46:10 +0000 Subject: [PATCH 4/4] Process code review comments (PR #2069). --- setup/static/render.js | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/setup/static/render.js b/setup/static/render.js index 7e36de0f..84ac5cc2 100644 --- a/setup/static/render.js +++ b/setup/static/render.js @@ -36,7 +36,7 @@ $(document).ready(function() { $(document).ready(function() { if ($("#database").val() == 'sqlite') { $("#external_db").hide(); - } else if ($("#database").val() != 'sqlite') { + } else { $("#external_db").show(); } @@ -45,47 +45,29 @@ $(document).ready(function() { $("#db_flavor_rc_sel").show(); } else { $("#db_flavor_rc_sel").hide(); - $("#roundcube_db_user").prop('required',false); - $("#roundcube_db_pw").prop('required',false); - $("#roundcube_db_url").prop('required',false); - $("#roundcube_db_name").prop('required',false); + $("#roundcube_db_user,#roundcube_db_pw,#roundcube_db_url,#roundcube_db_name").prop('required',false); } }); $("#database").click(function() { if (this.value == 'sqlite') { $("#external_db").hide(); - $("#db_user").prop('required',false); - $("#db_pw").prop('required',false); - $("#db_url").prop('required',false); - $("#db_name").prop('required',false); - $("#roundcube_db_user").prop('required',false); - $("#roundcube_db_pw").prop('required',false); - $("#roundcube_db_url").prop('required',false); - $("#roundcube_db_name").prop('required',false); - } else if (this.value != 'sqlite') { + $("#db_user,#db_pw,#db_url,#db_name").prop('required',false); + $("#roundcube_db_user,#roundcube_db_pw,#roundcube_db_url,#roundcube_db_name").prop('required',false); + } else { $("#external_db").show(); - $("#db_user").prop('required',true); - $("#db_pw").prop('required',true); - $("#db_url").prop('required',true); - $("#db_name").prop('required',true); + $("#db_user,#db_pw,#db_url,#db_name").prop('required',true); } }); $("#database_rc").click(function() { if (this.value == 'sqlite'){ $("#roundcube_external_db").hide(); - $("#roundcube_db_user").prop('required',false); - $("#roundcube_db_pw").prop('required',false); - $("#roundcube_db_url").prop('required',false); - $("#roundcube_db_name").prop('required',false); + $("#roundcube_db_user,#roundcube_db_pw,#roundcube_db_url,#roundcube_db_name").prop('required',false); } - if (this.value != 'sqlite' && $("#webmail").val() == 'roundcube') { + else if ($("#webmail").val() == 'roundcube') { $("#roundcube_external_db").show(); - $("#roundcube_db_user").prop('required',true); - $("#roundcube_db_pw").prop('required',true); - $("#roundcube_db_url").prop('required',true); - $("#roundcube_db_name").prop('required',true); + $("#roundcube_db_user,#roundcube_db_pw,#roundcube_db_url,#roundcube_db_name").prop('required',true); } }); });