Cleanup.

readthedocs/core/djangome_urls.py

@@ -23,4 +23,6 @@ urlpatterns = patterns(
     url('^%s/(?P<term>[\w\-\.]+)/stats$' % ALL_VERSIONS_RE,
         'djangome.views.show_term',
         name='show_term'),
+    # Hack in a core.views.homepage bit for reverse in base template
+    url(r'home/', 'core.views.homepage'),
 )

readthedocs/projects/models.py

@@ -412,8 +412,10 @@ class Project(models.Model):
     def cnames_symlink_path(self, domain):
         """
         Path in the doc_path that we symlink cnames
+
+        This has to be at the top-level because Nginx doesn't know the projects slug.
         """
-        return os.path.join(self.doc_path, 'cnames', domain)
+        return os.path.join(settings.CNAME_ROOT, domain)
 
     def translations_symlink_path(self, language=None):
         """
@@ -489,12 +491,6 @@ class Project(models.Model):
         """
         return os.path.join(self.doc_path, 'rtd-builds', version)
 
-    def rtd_cname_path(self, cname):
-        """
-        The path to the build html docs in the project.
-        """
-        return os.path.join(settings.CNAME_ROOT, cname)
-
     def conf_file(self, version='latest'):
         if self.conf_py_file:
             log.debug('Inserting conf.py file path from model')

readthedocs/projects/tasks.py

@@ -679,10 +679,6 @@ def symlink_cnames(version):
         symlink = version.project.rtd_cname_path(cname)
         run_on_app_servers('mkdir -p %s' % '/'.join(symlink.split('/')[:-1]))
         run_on_app_servers('ln -nsf %s %s' % (docs_dir, symlink))
-        # New symlink location 
-        symlink = version.project.cnames_symlink_path(cname)
-        run_on_app_servers('mkdir -p %s' % '/'.join(symlink.split('/')[:-1]))
-        run_on_app_servers('ln -nsf %s %s' % (docs_dir, symlink))
 
 
 def symlink_subprojects(version):

readthedocs/settings/base.py

@@ -27,6 +27,7 @@ LOGS_ROOT = os.path.join(SITE_ROOT, 'logs')
 MEDIA_ROOT = '%s/media/' % (SITE_ROOT)
 MEDIA_URL = '/media/'
 ADMIN_MEDIA_PREFIX = '/media/admin/'
+
 # For 1.4
 STATIC_ROOT = os.path.join(SITE_ROOT, 'media/static/')
 STATIC_URL = '/static/'