Skip to content

Commit 3a09f3b

Browse files
committed
Cleanup Vagrantfile and README.markdown.
1 parent b7557e2 commit 3a09f3b

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

README.markdown

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
# PYTHONKC.COM WEBSITE
1+
# `pythonkc.com` website
22

33
[![Join the chat at https://gitter.im/pythonkc/pythonkc.com](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pythonkc/pythonkc.com?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44

5-
Files for the PythonKC.com website.
5+
Files for the `pythonkc.com` website.
66

77
## Development Quickstart Option 1 (vagrant)
88

99
We're going to use Vagrant and Virtualbox to run pythonkc.com inside a Debian
10-
VM. We're using the [shell provisioner][] to install Ansible inside our VM and
10+
VM. We're using the [shell provisioner][shell] to install Ansible inside our VM and
1111
then using Ansible to manage the environment from there. (Note: we're *not*
12-
using the [ansible provisioner][].)
12+
using the [ansible provisioner][ansible].)
1313

14-
First you need to install [Vagrant][] and [VirtualBox][] and clone [our
14+
First you need to install [Vagrant][vagrant] and [VirtualBox][virtualbox] and clone [our
1515
repository][] from github.
1616

1717
Now copy `pythonkc_site/.env.example` to `pythonkc_site/.env` and add
18-
your own [meetup api key][] and a unique [django secret key][] (`.env` will
18+
your own [meetup api key][meetup] and a unique [django secret key][django] (`.env` will
1919
be ignored by git)
2020

2121
Then you have to install some vagrant plugins and build your vagrant box:
@@ -63,7 +63,7 @@ ansible-playbook vagrant.yml -e python_version=3
6363

6464
```
6565
mkvirtualenv pythonkc
66-
git clone git@github.com:pythonkc/pythonkc.com.git
66+
git clone git@github.com:pythonkc/pythonkc-com.git
6767
cd pythonkc.com/pythonkc_site
6868
pip install -r requirements/project.txt
6969
python manage.py runserver
@@ -77,11 +77,9 @@ See: docs/local_development
7777

7878

7979

80-
[Vagrant]: https://www.vagrantup.com/downloads.html
81-
[VirtualBox]: https://www.virtualbox.org
82-
[shell provisioner]: http://docs.vagrantup.com/v2/provisioning/shell.html
83-
[ansible provisioner]: http://docs.vagrantup.com/v2/provisioning/ansible.html
84-
[our repository]: https://github.com/pythonkc/pythonkc.com
85-
[meetup api key]: https://secure.meetup.com/meetup_api/key/
86-
[django secret key]: http://www.miniwebtool.com/django-secret-key-generator/
87-
80+
[ansible]: http://docs.vagrantup.com/v2/provisioning/ansible.html
81+
[django]: http://www.miniwebtool.com/django-secret-key-generator/
82+
[meetup]: https://secure.meetup.com/meetup_api/key/
83+
[shell]: http://docs.vagrantup.com/v2/provisioning/shell.html
84+
[vagrant]: https://www.vagrantup.com/downloads.html
85+
[virtualbox]: https://www.virtualbox.org

Vagrantfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
3737

3838
# vagrant-vbguest plugin is required
3939
unless Vagrant.has_plugin?("vagrant-vbguest")
40-
raise'vagrant-vbguest is not installed. run: vagrant plugin install vagrant-vbguest'
40+
raise 'vagrant-vbguest is not installed. run: vagrant plugin install vagrant-vbguest'
4141
end
4242

4343
config.vm.define "pykcdotdev" do |pykcdotdev|
4444
pykcdotdev.vm.box = "debian/jessie64"
4545
pykcdotdev.vm.hostname = "pythonkc.dev"
46-
pykcdotdev.vm.network "private_network", ip: "192.168.100.101"
46+
pykcdotdev.vm.network "private_network", type: "dhcp"
4747
if OS.unix?
48-
pykcdotdev.vm.synced_folder "./", "/vagrant/", type: "nfs"
48+
pykcdotdev.vm.synced_folder "./", "/vagrant/", type: "nfs"
4949
elsif OS.windows?
50-
pykcdotdev.vm.synced_folder "./", "/vagrant/" # , type: "smb"
50+
pykcdotdev.vm.synced_folder "./", "/vagrant/", type: "smb"
5151
else
5252
raise 'Unknown host operating system. Cannot continue.'
5353
end

0 commit comments

Comments
 (0)