diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Vagrantfile | 9 | ||||
| -rw-r--r-- | doc/INSTALL.md | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 32a1e77f5..fd02983c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,7 +243,7 @@ GEM hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) statistics2 (0.54) syslog_protocol (0.9.2) diff --git a/Vagrantfile b/Vagrantfile index 5d56914a5..31b2553a1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -46,6 +46,15 @@ # Both have the same effect, but exporting will retain the variable for the # duration of your shell session. # +# Using Themes +# ------------ +# +# You can also use the built in theme switcher (script/switch-theme.rb). The +# ALAVETELI_THEMES_DIR will be shared in to /home/vagrant/alaveteli-themes so +# that the default location is used on the guest. You can use the env var +# ALAVETELI_THEMES_DIR to change where this Vagrantfile looks for the themes +# directory on the host. +# # Customization Options # ===================== ALAVETELI_FQDN = ENV['ALAVETELI_VAGRANT_FQDN'] || "alaveteli.10.10.10.30.xip.io" diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 04cdb1352..f6563be99 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -255,7 +255,7 @@ Make sure that the user specified in database.yml exists, and has full permissions on these databases. As they need the ability to turn off constraints whilst running the tests they also need to be a superuser. If you don't want your database user to be a superuser, you can add a line -`disable_constraints: false` to the test config in database.yml, as seen in database.yml-example +`constraint_disabling: false` to the test config in database.yml, as seen in database.yml-example You can create a `foi` user from the command line, thus: |