Browse Source

[PHP-FPM, Config] API key generated via mailcow.conf as rw access

andryyy 5 years ago
parent
commit
730fa16a69
3 changed files with 3 additions and 2 deletions
  1. 1 1
      data/Dockerfiles/phpfpm/docker-entrypoint.sh
  2. 1 1
      docker-compose.yml
  3. 1 0
      generate_config.sh

+ 1 - 1
data/Dockerfiles/phpfpm/docker-entrypoint.sh

@@ -132,7 +132,7 @@ if [[ ${API_ALLOW_FROM} != "invalid" ]] && \
   if [[ ! -z ${VALIDATED_IPS} ]]; then
     mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} << EOF
 DELETE FROM api;
-INSERT INTO api (api_key, active, allow_from) VALUES ("${API_KEY}", "1", "${VALIDATED_IPS}");
+INSERT INTO api (api_key, active, allow_from, access) VALUES ("${API_KEY}", "1", "${VALIDATED_IPS}", "rw");
 EOF
   fi
 fi

+ 1 - 1
docker-compose.yml

@@ -102,7 +102,7 @@ services:
             - rspamd
 
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.58
+      image: mailcow/phpfpm:1.59
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
         - redis-mailcow

+ 1 - 0
generate_config.sh

@@ -277,6 +277,7 @@ IPV6_NETWORK=fd4d:6169:6c63:6f77::/64
 
 # Create or override API key for web ui
 # You _must_ define API_ALLOW_FROM, which is a comma separated list of IPs
+# The API key defined here has read-write access
 # API_KEY allowed chars: a-z, A-Z, 0-9, -
 
 #API_KEY=