diff --git a/apk/spoc b/apk/spoc index a6dd9ee..c1e60a4 160000 --- a/apk/spoc +++ b/apk/spoc @@ -1 +1 @@ -Subproject commit a6dd9ee3e44428b0d7e88b78cd94c4ade306714a +Subproject commit c1e60a4adf6339c0390e66ab07b63a242442d52a diff --git a/lxc-apps/ckan/install/ckan_conf/who.ini b/lxc-apps/ckan/install/ckan_conf/who.ini index eb2a5a5..885a497 100644 --- a/lxc-apps/ckan/install/ckan_conf/who.ini +++ b/lxc-apps/ckan/install/ckan_conf/who.ini @@ -1,10 +1,10 @@ [plugin:auth_tkt] -use = ckan.lib.repoze_plugins.auth_tkt:make_plugin +use = ckan.lib.auth_tkt:make_plugin # If no secret key is defined here, beaker.session.secret will be used #secret = somesecret [plugin:friendlyform] -use = ckan.lib.repoze_plugins.friendly_form:FriendlyFormPlugin +use = repoze.who.plugins.friendlyform:FriendlyFormPlugin login_form_url= /user/login login_handler_path = /login_generic logout_handler_path = /user/logout @@ -13,6 +13,10 @@ post_login_url = /user/logged_in post_logout_url = /user/logged_out charset = utf-8 +#[plugin:basicauth] +#use = repoze.who.plugins.basicauth:make_plugin +#realm = 'CKAN' + [general] request_classifier = repoze.who.classifiers:default_request_classifier challenge_decider = repoze.who.classifiers:default_challenge_decider @@ -30,3 +34,4 @@ plugins = [challengers] plugins = friendlyform;browser +# basicauth