diff --git a/Dockerfile b/Dockerfile index f21ae7a..3d389ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,8 +48,6 @@ ENV DEBIAN_FRONTEND=noninteractive \ TAIGA_ENABLE_EVENTS=false \ # Hostname for events server TAIGA_EVENTS_HOST=events \ - # Should Taiga automatically redirect to SSL version of Taiga? - TAIGA_REDIRECT_TO_SSL=false \ # Hostname of your instance (domain ex. riotkit.org or subdomain - board.riotkit.org) TAIGA_HOSTNAME=localhost \ # Set to `true` to enable the LDAP authentication. diff --git a/README.md b/README.md index 580dde1..f4d3bb0 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,11 @@ make start # tadam... ``` +##### First log-in to the application, default username and password + +To log-in first time you should go to the [login page](http://localhost/login?next=%252Fdiscover) and enter "admin" as username, and "123123" as password. +You can also log-in to the Django administration panel at http://localhost/admin/ (please remember about the slash at the end) + #### Configuring LDAP LDAP support can optionally be enabled by setting the `TAIGA_LDAP` environment variable to `true`. See the Dockerfile for a list of the environment variables used for configuring LDAP and their descriptions. @@ -141,9 +146,6 @@ List of all environment variables that could be used. # Hostname for events server - TAIGA_EVENTS_HOST # (default: events) -# Should Taiga automatically redirect to SSL version of Taiga? -- TAIGA_REDIRECT_TO_SSL # (default: false) - # Hostname of your instance (domain ex. riotkit.org or subdomain - board.riotkit.org) - TAIGA_HOSTNAME # (default: localhost) @@ -237,6 +239,9 @@ List of all environment variables that could be used. - TAIGA_GID # (default: 1000) +# List of plugins to enable eg. "slack, other, other", "slack" +- TAIGA_PLUGINS # (default: "") + ``` diff --git a/conf/nginx/nginx.conf.j2 b/conf/nginx/nginx.conf.j2 index b1379d5..2ebf6b1 100644 --- a/conf/nginx/nginx.conf.j2 +++ b/conf/nginx/nginx.conf.j2 @@ -22,14 +22,6 @@ http { keepalive_timeout 65; #gzip on; - {% if TAIGA_REDIRECT_TO_SSL.lower() == 'true' %} - server { - listen 80 default_server; - server_name _; - return 301 https://$server_name$request_uri; - } - {% endif %} - server { listen 80 default_server; server_name _;