aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/pre-install-as-root2
-rw-r--r--conf/nginx.conf.example6
2 files changed, 8 insertions, 0 deletions
diff --git a/bin/pre-install-as-root b/bin/pre-install-as-root
index 7ba759fd2..8d4c9dd26 100755
--- a/bin/pre-install-as-root
+++ b/bin/pre-install-as-root
@@ -275,6 +275,8 @@ install_nginx
install_website_packages "$REPOSITORY"
+su -l -c "touch '$DIRECTORY/admin-htpasswd'" "$UNIX_USER"
+
add_website_to_nginx "$UNIX_USER" "$HOST" "$REPOSITORY"
add_postgresql_user "$UNIX_USER"
diff --git a/conf/nginx.conf.example b/conf/nginx.conf.example
index c356da887..7b26afdbf 100644
--- a/conf/nginx.conf.example
+++ b/conf/nginx.conf.example
@@ -49,6 +49,12 @@ 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;