Merge branch 'master' into geocoder2

Dockerfile

@@ -6,7 +6,7 @@ MAINTAINER Stefan Verhoeven <s.verhoeven@esciencecenter.nl>
 
 # Configuring locales
 ENV DEBIAN_FRONTEND noninteractive
-RUN dpkg-reconfigure locales && \
+RUN apt-get update && apt-get install -y -q apt-utils && apt-get install -y -q locales && dpkg-reconfigure locales && \
       locale-gen en_US.UTF-8 && \
       update-locale LANG=en_US.UTF-8
 ENV LANG en_US.UTF-8
@@ -14,7 +14,6 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
-  apt-get update && \
   apt-get install -y -q \
     build-essential \
     autoconf \

README.md

@@ -27,7 +27,7 @@ How to run the container:
 -------------------------
 
 ```
-docker run -d -p 80:80 sverhoeven/cartodb
+docker run -d -p 80:80 -h cartodb.localhost sverhoeven/cartodb
 ```
 
 The CartoDB instance has been configured with the hostname `cartodb.localhost`, this means the web browser and web server need to be able to resolve `cartodb.localhost` to an IP adress of the machine where the web server is running.
@@ -42,7 +42,7 @@ How to use a different hostname:
 
 For example to use `cartodb.example.com` as a hostname start with:
 ```
-docker run -d -p 80:80 -e CARTO_HOST=cartodb.example.com sverhoeven/cartodb
+docker run -d -p 80:80 -h cartodb.example.com sverhoeven/cartodb
 ```
 
 The chosen hostname should also resolve to an IP adress of the machine where the web server is running.

config/WS-dev.js

@@ -34,8 +34,8 @@ var config = {
     //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
     //  3. {{=it.port}}: will use the `port` from this very same configuration file.
     ,resources_url_templates: {
-        http: 'http://cartodb.localhost:{{=it.port}}/user/{{=it.user}}/api/v1/map',
-        https: 'http://cartodb.localhost:{{=it.port}}/user/{{=it.user}}/api/v1/map'
+        http: 'http://cartodb.localhost/user/{{=it.user}}/api/v1/map',
+        https: 'http://cartodb.localhost/user/{{=it.user}}/api/v1/map'
     }
 
     // Maximum number of connections for one process

config/app_config.yml

@@ -29,8 +29,7 @@ defaults: &defaults
     internal:
       protocol:      'http'
       domain:        'cartodb.localhost'
-      port:          '8181'
-      host:          '127.0.0.1'
+      port:          '80'
       verifycert:     false
     private:
       protocol:      'http'
@@ -78,8 +77,8 @@ defaults: &defaults
     api_key:
   metrics:
     hubspot:
-      events_host: 'http://track.hubspot.com'
-      token: 'yourtoken'
+      events_host: ''
+      token: ''
       form_ids:
         newsletter: ''
       event_ids:
@@ -256,10 +255,10 @@ defaults: &defaults
         debug:              false
         visible:            true
         tiler_domain:       "cartodb.localhost"
-        tiler_port:         "8181"
+        tiler_port:         "80"
         tiler_protocol:     "http"
         sql_domain:         "cartodb.localhost"
-        sql_port:           "8080"
+        sql_port:           "80"
         sql_protocol:       "http"
         extra_params:       { cache_policy: 'persist' }
         tile_style_history: []

startup.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-CARTO_HOST=${CARTO_HOST=cartodb.localhost}
-perl -pi -e 's/cartodb\.localhost/$ENV{"CARTO_HOST"}/g' /etc/nginx/sites-enabled/default /cartodb/config/app_config.yml /Windshaft-cartodb/config/environments/development.js
+perl -pi -e 's/cartodb\.localhost/$ENV{"HOSTNAME"}/g' /etc/nginx/sites-enabled/default /cartodb/config/app_config.yml /Windshaft-cartodb/config/environments/development.js
 
 service postgresql start
 service redis-server start