Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Typo fixes #1

Merged
merged 5 commits into from almost 3 years ago

3 participants

Carl Meyer Aman Gupta Jacob Kaplan-Moss
Carl Meyer

No description provided.

Jacob Kaplan-Moss jacobian referenced this pull request from a commit April 25, 2011
Jacob Kaplan-Moss Merged pull request #1 from carljm/typo-fixes.
Typo fixes
b0ee18d
Jacob Kaplan-Moss jacobian merged commit b0ee18d into from April 25, 2011
Jacob Kaplan-Moss jacobian closed this April 25, 2011
Aman Gupta
tmm1 commented April 25, 2011

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.
2  fabfile.py
@@ -38,7 +38,7 @@ def push():
38 38
 def update_dependencies():
39 39
     "Update Mingus' requirements remotely."
40 40
     put("mingus-config/requirements.txt", "%s/requirements.txt", use_sudo=True)
41  
-    sudo("%(root)s/bin/pip install -r %(rot)s/requirements.txt" % env)
  41
+    sudo("%(root)s/bin/pip install -r %(root)s/requirements.txt" % env)
42 42
         
43 43
 def reload():
44 44
     "Reload Apache to pick up new code changes."
2  nginx/nginx.conf
@@ -49,7 +49,7 @@ http {
49 49
         
50 50
         # Serve media directly out of Nginx for performance
51 51
         location /media {
52  
-            alias /home/media;
  52
+            alias /home/web/myblog/django-mingus/mingus/media/;
53 53
         }
54 54
         
55 55
         # Proxy everything else to the backend
10  notes/pycon2011/script.txt
@@ -44,8 +44,8 @@ Bootstrap up the example app::
44 44
                            postgresql-dev postgresql-client build-essential \
45 45
                            libpq-dev subversion mercurial
46 46
     web1$ easy_install virtualenv
47  
-    web1$ git clone git://github.com/jacobian/django-deployment-workshop.git
48 47
     web1$ cd /home/web
  48
+    web1$ git clone git://github.com/jacobian/django-deployment-workshop.git
49 49
     web1$ virtualenv myblog
50 50
     web1$ cd myblog
51 51
     web1$ source bin/activate
@@ -56,7 +56,7 @@ Bootstrap up the example app::
56 56
     web1$ mv local_settings.py.template local_settings.py
57 57
     web1$ ./manage.py syncdb
58 58
     web1$ ./manage.py loaddata test_data.json
59  
-    web1$ ./bin/django runserver 0.0.0.0:8000
  59
+    web1$ ./manage.py runserver 0.0.0.0:8000
60 60
     
61 61
 Get ``http://pycon-web1:8000/`` - bing!
62 62
 
@@ -90,7 +90,7 @@ Wire up the app to PostgreSQL, load data, take a look::
90 90
     web1$ vim local_settings.py # DATABASE_HOST = '...'
91 91
     web1$ ./manage.py syncdb
92 92
     web1$ ./manage.py loaddata test_data.json
93  
-    web1$ ./bin/django runserver 0.0.0.0:8000    
  93
+    web1$ ./manage.py runserver 0.0.0.0:8000    
94 94
 
95 95
 Hit ``http://pycon-web1:8000/`` -- *boom*.
96 96
 
@@ -108,8 +108,8 @@ Add our config. Remember to make a python eggs dir (it should be writable by
108 108
 apache, but 777 is easier)::
109 109
 
110 110
     web1$ ln -s /home/web/django-deployment-workshop/apache/apache2.conf .
111  
-    web1$ ln -s /home/web/django-deployment-workshop/mingus-config/mingus.wsgi \
112  
-                /home/web/myblog/mingus.wsgi
  111
+    web1$ cp /home/web/django-deployment-workshop/mingus-config/mingus.wsgi \
  112
+             /home/web/myblog/mingus.wsgi
113 113
     web1$ mkdir -m777 -p /var/www/.python-eggs
114 114
     web1$ invoke-rc.d apache2 restart
115 115
 
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.