From b78a1619145181ce02b6f06a27075a24b12edddc Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Thu, 29 Apr 2021 11:48:17 +0200 Subject: [PATCH] Change default dev port to 7000 --- Vagrantfile | 4 ++-- config/action_mailer.yml.example | 1 + config/puma.rb | 4 ++-- docs/LOCAL_SETUP.md | 4 ++-- docs/webpython/README.md | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 795f1cf9..8b15904e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,8 +11,8 @@ Vagrant.configure(2) do |config| end config.vm.network 'forwarded_port', host_ip: ENV['LISTEN_ADDRESS'] || '127.0.0.1', - host: 3000, - guest: 3000 + host: 7000, + guest: 7000 config.vm.synced_folder '.', '/home/vagrant/codeocean' config.vm.synced_folder '../dockercontainerpool', '/home/vagrant/dockercontainerpool' config.vm.provision 'shell', path: 'provision/provision.vagrant.sh', privileged: false diff --git a/config/action_mailer.yml.example b/config/action_mailer.yml.example index 5948ee9f..503b8447 100644 --- a/config/action_mailer.yml.example +++ b/config/action_mailer.yml.example @@ -7,6 +7,7 @@ development: <<: *default default_url_options: host: localhost + port: 7000 delivery_method: :test production: diff --git a/config/puma.rb b/config/puma.rb index a5eccf81..edae0587 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -7,9 +7,9 @@ threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } threads threads_count, threads_count -# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# Specifies the `port` that Puma will listen on to receive requests; default is 7000. # -port ENV.fetch("PORT") { 3000 } +port ENV.fetch("PORT") { 7000 } # Specifies the `environment` that Puma will run in. # diff --git a/docs/LOCAL_SETUP.md b/docs/LOCAL_SETUP.md index bfc2df47..58407c1d 100644 --- a/docs/LOCAL_SETUP.md +++ b/docs/LOCAL_SETUP.md @@ -39,7 +39,7 @@ rails s -p 3100 # using another ssh session cd /home/vagrant/codeocean -rails s -p 3000 -b 0.0.0.0 +rails s -p 7000 -b 0.0.0.0 ``` The default credentials for the internal users are the following: @@ -216,7 +216,7 @@ source "$HOME/.profile" ### Start CodeOcean - Start CodeOcean by executing `rails s` in the project root -- Open `localhost:3000` in your browser +- Open `localhost:7000` in your browser - You can login as administrator with the user `admin@example.org` and the password `admin` ## Native setup (for macOS) diff --git a/docs/webpython/README.md b/docs/webpython/README.md index e95eb83d..0d74cfd5 100644 --- a/docs/webpython/README.md +++ b/docs/webpython/README.md @@ -17,7 +17,7 @@ Local setup host: tcp://localhost:2375 ws_host: ws://localhost:2375 -5. Run the CodeOcean server with `rails s -p 3333` +5. Run the CodeOcean server with `rails s -p 7000` 6. Login with admin@example.org (pw: admin) and create a new execution environment picking the newly created Docker image from the dropdown. Set the initial command to: