aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-07-06 18:07:22 +0100
committerDave Arter <davea@mysociety.org>2016-07-19 17:56:22 +0100
commit6afbfe45183412e35e8e846fd0d4a9d846c8644b (patch)
tree3f5cb6173c08a571811f0a31508b45acf31d69f7 /conf
parent65545553b5171f1ef1d611ea93c38f138451fb31 (diff)
Use normal user authentication to control access to /admin
- Adds is_superuser flag to User - Logged-in user must be a superuser or have from_body set in order to access anything within /admin - has_permission_to on a superuser will always return true - Only superusers can create/grant superusers - New `createsuperuser` command for creating superusers
Diffstat (limited to 'conf')
-rw-r--r--conf/apache-vhost.conf.example8
-rw-r--r--conf/nginx.conf.example6
2 files changed, 0 insertions, 14 deletions
diff --git a/conf/apache-vhost.conf.example b/conf/apache-vhost.conf.example
index 583eb0cde..b4a3e78f0 100644
--- a/conf/apache-vhost.conf.example
+++ b/conf/apache-vhost.conf.example
@@ -25,14 +25,6 @@
AllowOverride None
</Directory>
- <Location /admin>
- #
- # WARNING - enable auth here on production machine
- #
- </Location>
-
- Alias /admin/ /home/yourname/fixmystreet/web-admin/
-
Alias /jslib/ /home/yourname/fixmystreet/commonlib/jslib/
<Location /jslib>
AddOutputFilter DEFLATE js
diff --git a/conf/nginx.conf.example b/conf/nginx.conf.example
index 69416a1c5..e166fc532 100644
--- a/conf/nginx.conf.example
+++ b/conf/nginx.conf.example
@@ -51,12 +51,6 @@ server {
proxy_set_header X-Real-IP $remote_addr;
}
- location /admin {
- auth_basic "FixMyStreet admin interface";
- auth_basic_user_file /var/www/fixmystreet/admin-htpasswd;
- try_files $uri @catalyst;
- }
-
location / {
if (-f $document_root/down.html) {
return 503;