Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Typo fixes #1

Merged
merged 5 commits into from

3 participants

@carljm

No description provided.

@jacobian jacobian referenced this pull request from a commit
@jacobian jacobian Merged pull request #1 from carljm/typo-fixes.
Typo fixes
b0ee18d
@jacobian jacobian merged commit b0ee18d into jacobian-archive:master
@tmm1

Hey there,

Soon after the new GitHub Merge Button feature was released today we discovered a bug in the merge procedure in certain cases. This pull request was affected by the bug, causing code to not actually get merged even though it looks from the history as though it was.

To bring the master branch back to its expected state, commit this diff of changes that were missed by the merge:

diff --git a/fabfile.py b/fabfile.py
index f1512ae..ad4677c 100644
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 8fd2982..cd64e61 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -50,7 +50,7 @@ http {

         # Serve media directly out of Nginx for performance
         location /media {
-            alias /home/media;
+            alias /home/web/myblog/django-mingus/mingus/media/;
         }

         # Proxy everything else to the backend
diff --git a/notes/pycon2011/script.txt b/notes/pycon2011/script.txt
index e8d059d..5549279 100644
--- a/notes/pycon2011/script.txt
+++ b/notes/pycon2011/script.txt
@@ -44,8 +44,8 @@ Bootstrap up the example app::
                            postgresql-dev postgresql-client build-essential \
                            libpq-dev subversion mercurial
     web1$ easy_install virtualenv
-    web1$ git clone git://github.com/jacobian/django-deployment-workshop.git
     web1$ cd /home/web
+    web1$ git clone git://github.com/jacobian/django-deployment-workshop.git
     web1$ virtualenv myblog
     web1$ cd myblog
     web1$ source bin/activate
@@ -56,7 +56,7 @@ Bootstrap up the example app::
     web1$ mv local_settings.py.template local_settings.py
     web1$ ./manage.py syncdb
     web1$ ./manage.py loaddata test_data.json
-    web1$ ./bin/django runserver 0.0.0.0:8000
+    web1$ ./manage.py runserver 0.0.0.0:8000

 Get ``http://pycon-web1:8000/`` - bing!

@@ -90,7 +90,7 @@ Wire up the app to PostgreSQL, load data, take a look::
     web1$ vim local_settings.py # DATABASE_HOST = '...'
     web1$ ./manage.py syncdb
     web1$ ./manage.py loaddata test_data.json
-    web1$ ./bin/django runserver 0.0.0.0:8000    
+    web1$ ./manage.py runserver 0.0.0.0:8000    

 Hit ``http://pycon-web1:8000/`` -- *boom*.

@@ -108,8 +108,8 @@ Add our config. Remember to make a python eggs dir (it should be writable by
 apache, but 777 is easier)::

     web1$ ln -s /home/web/django-deployment-workshop/apache/apache2.conf .
-    web1$ ln -s /home/web/django-deployment-workshop/mingus-config/mingus.wsgi \
-                /home/web/myblog/mingus.wsgi
+    web1$ cp /home/web/django-deployment-workshop/mingus-config/mingus.wsgi \
+             /home/web/myblog/mingus.wsgi
     web1$ mkdir -m777 -p /var/www/.python-eggs
     web1$ invoke-rc.d apache2 restart

Sorry for the inconvenience. If you have any questions or need help, do not hesitate to contact support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 7 deletions.
  1. +1 −1  fabfile.py
  2. +1 −1  nginx/nginx.conf
  3. +5 −5 notes/pycon2011/script.txt
View
2  fabfile.py
@@ -38,7 +38,7 @@ def push():
def update_dependencies():
"Update Mingus' requirements remotely."
put("mingus-config/requirements.txt", "%s/requirements.txt", use_sudo=True)
- sudo("%(root)s/bin/pip install -r %(rot)s/requirements.txt" % env)
+ sudo("%(root)s/bin/pip install -r %(root)s/requirements.txt" % env)
def reload():
"Reload Apache to pick up new code changes."
View
2  nginx/nginx.conf
@@ -49,7 +49,7 @@ http {
# Serve media directly out of Nginx for performance
location /media {
- alias /home/media;
+ alias /home/web/myblog/django-mingus/mingus/media/;
}
# Proxy everything else to the backend
View
10 notes/pycon2011/script.txt
@@ -44,8 +44,8 @@ Bootstrap up the example app::
postgresql-dev postgresql-client build-essential \
libpq-dev subversion mercurial
web1$ easy_install virtualenv
- web1$ git clone git://github.com/jacobian/django-deployment-workshop.git
web1$ cd /home/web
+ web1$ git clone git://github.com/jacobian/django-deployment-workshop.git
web1$ virtualenv myblog
web1$ cd myblog
web1$ source bin/activate
@@ -56,7 +56,7 @@ Bootstrap up the example app::
web1$ mv local_settings.py.template local_settings.py
web1$ ./manage.py syncdb
web1$ ./manage.py loaddata test_data.json
- web1$ ./bin/django runserver 0.0.0.0:8000
+ web1$ ./manage.py runserver 0.0.0.0:8000
Get ``http://pycon-web1:8000/`` - bing!
@@ -90,7 +90,7 @@ Wire up the app to PostgreSQL, load data, take a look::
web1$ vim local_settings.py # DATABASE_HOST = '...'
web1$ ./manage.py syncdb
web1$ ./manage.py loaddata test_data.json
- web1$ ./bin/django runserver 0.0.0.0:8000
+ web1$ ./manage.py runserver 0.0.0.0:8000
Hit ``http://pycon-web1:8000/`` -- *boom*.
@@ -108,8 +108,8 @@ Add our config. Remember to make a python eggs dir (it should be writable by
apache, but 777 is easier)::
web1$ ln -s /home/web/django-deployment-workshop/apache/apache2.conf .
- web1$ ln -s /home/web/django-deployment-workshop/mingus-config/mingus.wsgi \
- /home/web/myblog/mingus.wsgi
+ web1$ cp /home/web/django-deployment-workshop/mingus-config/mingus.wsgi \
+ /home/web/myblog/mingus.wsgi
web1$ mkdir -m777 -p /var/www/.python-eggs
web1$ invoke-rc.d apache2 restart
Something went wrong with that request. Please try again.