add varnish config to ignore locales
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/out" />
</component>
+ <component name="RegexUtilComponent" text="1900-01-01 2007/08/13 1900.01.01 1900 01 01 1900-01.01 1900 13 01 1900 02 31" flags="0" regex="(19|20)\d\d([- /.])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])" mode="0" />
</project>
--- a/admin/default.vcl
+++ b/admin/default.vcl
@@ -34,6 +34,17 @@
}
}
}
+sub vcl_hash {
+ # http://serverfault.com/questions/112531/ignoring-get-parameters-in-varnish-vcl
+ set req.url = regsub(req.url, "/../|/.._../", "/");
+ hash_data(req.url);
+ if (req.http.host) {
+ hash_data(req.http.host);
+ } else {
+ hash_data(server.ip);
+ }
+ return (hash);
+}
sub vcl_deliver {
if (!resp.http.Vary) {
set resp.http.Vary = "Accept-Encoding";
--- a/ckanext/datagovau/plugin.py
+++ b/ckanext/datagovau/plugin.py
@@ -26,7 +26,6 @@
lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')]
return created_datasets_list + active_datasets_list
-
class DataGovAuPlugin(plugins.SingletonPlugin,
tk.DefaultDatasetForm):
'''An example IDatasetForm CKAN plugin.
@@ -37,14 +36,6 @@
plugins.implements(plugins.IConfigurer, inherit=False)
plugins.implements(plugins.IDatasetForm, inherit=False)
plugins.implements(plugins.ITemplateHelpers, inherit=False)
- plugins.implements(plugins.IAuthFunctions)
-
- def datastore_search(context, data_dict):
- return {'success': True} # allow all
-
- def get_auth_functions(self):
- return {'datastore_search': datastore_search}
-
def update_config(self, config):
# Add this plugin's templates dir to CKAN's extra_template_paths, so
@@ -72,17 +63,17 @@
def create_package_schema(self):
- schema = super(ExampleIDatasetFormPlugin, self).create_package_schema()
+ schema = super(DataGovAuPlugin, self).create_package_schema()
schema = self._modify_package_schema(schema)
return schema
def update_package_schema(self):
- schema = super(ExampleIDatasetFormPlugin, self).update_package_schema()
+ schema = super(DataGovAuPlugin, self).update_package_schema()
schema = self._modify_package_schema(schema)
return schema
def show_package_schema(self):
- schema = super(ExampleIDatasetFormPlugin, self).show_package_schema()
+ schema = super(DataGovAuPlugin, self).show_package_schema()
# Don't show vocab tags mixed in with normal 'free' tags
# (e.g. on dataset pages, or on the search page)
@@ -145,25 +136,25 @@
# called.
def setup_template_variables(self, context, data_dict):
- return super(ExampleIDatasetFormPlugin, self).setup_template_variables(
+ return super(DataGovAuPlugin, self).setup_template_variables(
context, data_dict)
def new_template(self):
- return super(ExampleIDatasetFormPlugin, self).new_template()
+ return super(DataGovAuPlugin, self).new_template()
def read_template(self):
- return super(ExampleIDatasetFormPlugin, self).read_template()
+ return super(DataGovAuPlugin, self).read_template()
def edit_template(self):
- return super(ExampleIDatasetFormPlugin, self).edit_template()
+ return super(DataGovAuPlugin, self).edit_template()
def search_template(self):
- return super(ExampleIDatasetFormPlugin, self).search_template()
+ return super(DataGovAuPlugin, self).search_template()
def history_template(self):
- return super(ExampleIDatasetFormPlugin, self).history_template()
+ return super(DataGovAuPlugin, self).history_template()
def package_form(self):
- return super(ExampleIDatasetFormPlugin, self).package_form()
+ return super(DataGovAuPlugin, self).package_form()
--- a/ckanext/datagovau/templates/package/resource_read.html
+++ b/ckanext/datagovau/templates/package/resource_read.html
@@ -14,7 +14,7 @@
<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{res['revision_timestamp']}}" />
<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{res['created']}}" />
-<meta name="DCTERMS.Source.URI" content="{{pkg.url}}" />{% endif %}
+<meta name="DCTERMS.Source.URI" content="{{pkg.url}}" />
<meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage}}" />
<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage}}" />