summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-04-13 21:08:45 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-04-13 21:08:45 -0400
commitc6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (patch)
tree138b206e95b7ec98ad9d319dd95157a2028b4cd1 /urls.py
parent81a4f3e5e602d900ebfb2c20eb7565fddfb013a2 (diff)
parentc910b9220c45eb9d493d260f325efda2141205a4 (diff)
Merge branch 'archweb-generic' into master-nomake
# Conflicts: # public/views.py
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/urls.py b/urls.py
index 04f5ecd2..c730cca5 100644
--- a/urls.py
+++ b/urls.py
@@ -40,20 +40,19 @@ urlpatterns += patterns('public.views',
# Feeds patterns, used below
feeds_patterns = patterns('',
(r'^$', 'public.views.feeds', {}, 'feeds-list'),
- (r'^news/$', cache_page(300)(NewsFeed())),
- (r'^packages/$', cache_page(300)(PackageFeed())),
+ (r'^news/$', cache_page(311)(NewsFeed())),
+ (r'^packages/$', cache_page(313)(PackageFeed())),
(r'^packages/(?P<arch>[A-z0-9]+)/$',
- cache_page(300)(PackageFeed())),
+ cache_page(313)(PackageFeed())),
(r'^packages/all/(?P<repo>[A-z0-9\-]+)/$',
- cache_page(300)(PackageFeed())),
+ cache_page(313)(PackageFeed())),
(r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
- cache_page(300)(PackageFeed())),
- (r'^releases/$', cache_page(300)(ReleaseFeed())),
+ cache_page(313)(PackageFeed())),
+ (r'^releases/$', cache_page(317)(ReleaseFeed())),
)
# Includes and other remaining stuff
urlpatterns += patterns('',
- # cache this static JS resource for 1 week rather than default 5 minutes
(r'^admin/', include(admin.site.urls)),
(r'^devel/', include('devel.urls')),
(r'^feeds/', include(feeds_patterns)),
@@ -74,10 +73,10 @@ urlpatterns += patterns('',
# Sitemaps
urlpatterns += patterns('',
(r'^sitemap.xml$',
- cache_page(1800)(sitemap_views.index),
+ cache_page(1831)(sitemap_views.index),
{'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}),
(r'^sitemap-(?P<section>.+)\.xml$',
- cache_page(1800)(sitemap_views.sitemap),
+ cache_page(1831)(sitemap_views.sitemap),
{'sitemaps': our_sitemaps}, 'sitemaps'),
)