patches

.gitignore

@@ -36,6 +36,7 @@ todo.txt
 *.pfx
 *.pem
 *.key
+!config/localhost.key
 passenger.*
 passenger-standalone.json.bkp
 public/pdf.js/

README.md

@@ -57,10 +57,18 @@ Please read and abide by our [Code of Conduct](https://publiclab.org/conduct); o
 6. Run `rake db:setup` to set up the database
 7. Install static assets (like external javascript libraries, fonts) with `bower install`
 8. By default, start rails with `passenger start` from the Rails root and open http://localhost:3000 in a web browser.
-But if you are willing to establish a secure connection in development mode then use 'passenger start --ssl --ssl-certificate localhost.crt --ssl-certificate-key localhost.key --ssl-port 3001'. Then open up https://localhost:3001. Add security exceptions from the advance settings of the browser. Secure connection is needed for OAuth etc.
+(for local SSL work, see [SSL](#ssl+in+development) below)
 9. Wheeeee! You're up and running! Log in with test usernames "user", "moderator", or "admin", and password "password".
 10. Run `rake test` to confirm that your install is working properly. For some setups, you may see warnings even if test pass; [see this issue](https://github.com/publiclab/plots2/issues/440) we're working to resolve.
 
+## SSL in Development
+We at public labs use [openssl](https://github.com/ruby/openssl) gem to provide SSL for the secure connection in the development mode. You can run the https connection on the localhost by following following steps:
+1. Use 'passenger start --ssl --ssl-certificate config/localhost.crt --ssl-certificate-key config/localhost.key --ssl-port 3001'.
+2. Open up https://localhost:3001.
+3. Add security exceptions from the advance settings of the browser.
+You can also use http (unsecure connection) on the port number 3000 by going to 'http://localhost:3000'. We use port number 3001 for 'https' and port number 3000 for 'http' connection.
+Secure connection is needed for OAuth authentication etc.
+
 ## How to start and modify cron jobs
 
 1. We are using whenever gem to schedule cron jobs [Whenever](https://github.com/javan/whenever)