Include WEB-INF/config.properties in config generator

freeciv-web/src/main/webapp/WEB-INF/config.properties.dist

@@ -1,9 +1,11 @@
 captcha_secret=secret goes here
 savegame_dir=/var/lib/tomcat8/webapps/data/savegames/
-email_username=username
-email_password=password
+email_username=#SMTP_LOGIN#
+email_password=#SMTP_PASSWORD#
+email_host=#SMTP_HOST#
+email_port=#SMTP_PORT#
+email_sender=#SMTP_SENDER#
 google-signin-client-key=122428231951-2vrvrtd9sc2v9nktemclkvc2t187jkr6.apps.googleusercontent.com
 #ga-tracking-id=UA-40584174-1
 #trackjs-token=ee5dba6fe2e048f79b422157b450947b
-# Used in some messages, so put the production server even when testing.
-fcw_host=example.com
+fcw_host=#FCW_HOST#

scripts/install/gen-from-templates.sh

@@ -62,7 +62,7 @@ while IFS= read -r line; do
   fi
 done < "${CONFIG}" > "${TMPFILE}"
 
-for f in "${SRCDIR}"/{freeciv-proxy,pbem}/settings.ini "${SRCDIR}"/freeciv-web/flyway.properties "${SRCDIR}"/freeciv-web/src/main/webapp/META-INF/context.xml; do
+for f in "${SRCDIR}"/{freeciv-proxy,pbem}/settings.ini "${SRCDIR}"/freeciv-web/flyway.properties "${SRCDIR}"/freeciv-web/src/main/webapp/META-INF/context.xml "${SRCDIR}"/freeciv-web/src/main/webapp/WEB-INF/config.properties; do
   sed -f "${TMPFILE}" < "$f".dist > "$f"
 done
 rm "${TMPFILE}"