Verified Commit 5ace583e authored by Stefano Capitani's avatar Stefano Capitani

Merge remote-tracking branch 'upstream/stable-0.15.x' into stable-0.15.x

parents cb28eefe 0674438d
......@@ -257,8 +257,9 @@ write_locale_conf(){
echo "---" > "$conf"
echo "localeGenPath: /etc/locale.gen" >> "$conf"
if ${geoip}; then
echo "geoipUrl:" >> "$conf"
echo "geoipUrl:" >> "$conf"
echo "geoipStyle: json" >> "$conf"
echo "geoipSelector: timezone" >> "$conf"
echo "region: America" >> "$conf"
echo "zone: New_York" >> "$conf"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment