Merge lp:~jose/charms/precise/tracks/use-lower-ports into lp:charms/tracks

[José Antonio Rey]

This merge will allow users to set ports lower than 1025 (80 as an example) for Tracks without the need of a proxy or anything.

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM. Tested deploying with default port (80) on lxc and also tested changing the port via `juju set`.

Thanks José!

review: Approve

[Charles Butler (lazypower)]

+1 LGTM

Thanks for the continued effort on the Tracks charm, making it a great addition to our charm library José!

review: Approve

=== modified file 'README.md'
--- README.md	2014-05-08 00:34:17 +0000
+++ README.md	2014-07-15 01:06:48 +0000
@@ -24,15 +24,7 @@
 ## Configuration
 
 This charm offers one configuration option, the port on which to run the web
-server, default is 3000. At this point, it can not be ran in a port minor to
-1025. If you set a port lower or equal to 1024, it will refuse to install
-until you change it. If you want to use port 80, for example, you can add a
-reverse proxy server, such as haproxy (also available in Juju).
-
-# Known Limitations
-
-As mentioned in the configuration part, the charm does not currently allow a
-port number lower than 1025.
+server, default is 80.
 
 # Links
 

=== modified file 'config.yaml'
--- config.yaml	2014-05-08 00:34:17 +0000
+++ config.yaml	2014-07-15 01:06:48 +0000
@@ -1,5 +1,5 @@
 options:
     port:
         type: int
-        default: 3000
+        default: 80
         description: The port number for the tracks webserver

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-05-12 19:05:38 +0000
+++ hooks/config-changed	2014-07-15 01:06:48 +0000
@@ -4,17 +4,6 @@
 
 PORT=`config-get port`
 
-if [[ "$PORT" -lt 1025 ]]; then
-    juju-log "At this time, ports minor than 1024 are not supported. Please, change your port number."
-    exit 0
-fi
-
-if [[ -f .portnotsupported ]] &&  [[ "$PORT" -lt 1024 ]]; then
-    juju-log "Yay, you've set a valid port now. Installing!"
-    hooks/install
-    rm .portnotsupported
-fi
-
 if [ -f .port ] && [ `cat .port` != "${PORT}" ]; then
     currentport=`cat .port`
     juju-log "Switching port to ${PORT}"

=== modified file 'hooks/install'
--- hooks/install	2014-05-12 19:05:38 +0000
+++ hooks/install	2014-07-15 01:06:48 +0000
@@ -7,13 +7,6 @@
 
 PORT=`config-get port`
 
-juju-log "Checking if port is >1024"
-if [[ "$PORT" -lt 1025 ]]; then
-    juju-log "At this point, the use of ports minor than 1025 are not supported. Please, change your port number."
-    touch .portnotsupported
-    exit 0
-fi
-
 juju-log "creating user tracks"
 useradd -rm tracks
 
@@ -23,7 +16,8 @@
 apt-get install -qqy unzip ruby2.1 build-essential libmysqlclient-dev \
 libruby sqlite3 libmysql-ruby libmysql-ruby libsqlite3-ruby libsqlite3-dev \
 imagemagick graphicsmagick libgraphicsmagick1-dev librmagick-ruby \
-libxslt-dev libxml2-dev pwgen rubygems mysql-client wget ruby2.1-dev
+libxslt-dev libxml2-dev pwgen rubygems mysql-client wget ruby2.1-dev \
+libcap2-bin
 
 juju-log "installing tracks"
 cd /home/tracks/
@@ -67,3 +61,5 @@
 bundle exec rails server -e production -p \$PORT
 end script
 EOF
+
+setcap cap_net_bind_service=+ep /usr/bin/ruby2.1