Merge 194c90e into 9646d3a

mozilla · Jan 29, 2017 · 8a9d71c · 8a9d71c
2 parents 9646d3a + 194c90e
commit 8a9d71c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/docs/installation/installation-docker.rst b/docs/installation/installation-docker.rst
@@ -73,22 +73,26 @@ Building mozillians
      $ docker-compose run db /bin/bash
      shell> mysql_tzinfo_to_sql /usr/share/zoneinfo/ | mysql -uroot -proot -h db_1 mysql
 
-#. Create user
+#. Create a superuser::
 
-   #. Run mozillians::
+    $ docker-compose run web python manage.py createsuperuser
+
+#. Give permissions to the user::
+
+    $ docker-compose run web ./scripts/su.sh
+
+#. Run mozillians::
 
         docker-compose up
 
    #. Load http://127.0.0.1:8000 or (for Mac users only) ``<IP>:8000`` where ``<IP>`` is the one returned by ``boot2docker ip`` command.
    #. Sign in with persona to create your profile.
    #. Stop the server with ``Ctrl^C``.
-   #. Vouch your account and convert it to superuser::
-
-        docker-compose run web ./scripts/su.sh
 
       .. note::
 
          In case this command doesn't work, you can run ``./scripts/su.sh`` inside the container. In order to get shell access please run ``docker-compose run web /bin/bash``.
+         To access in the site: http://127.0.0.1:8000/admin, the button signin cannot work.
 
 ******************
 Running mozillians

diff --git a/mozillians/settings/local.py-devdist b/mozillians/settings/local.py-devdist
@@ -42,6 +42,14 @@ ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
 
+OIDC_OP_AUTHORIZATION_ENDPOINT = ''
+OIDC_OP_TOKEN_ENDPOINT = ''
+OIDC_OP_USER_ENDPOINT = ''
+OIDC_RP_CLIENT_ID = ''
+OIDC_RP_CLIENT_SECRET = ''
+OIDC_RP_CLIENT_SECRET_ENCODED = True
+OIDC_OP_DOMAIN = 'http://127.0.0.1:8000'
+
 MANAGERS = ADMINS
 
 DEBUG = TEMPLATE_DEBUG = True

diff --git a/mozillians/settings/local.py-dist b/mozillians/settings/local.py-dist
@@ -36,6 +36,14 @@ ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
 
+OIDC_OP_AUTHORIZATION_ENDPOINT = ''
+OIDC_OP_TOKEN_ENDPOINT = ''
+OIDC_OP_USER_ENDPOINT = ''
+OIDC_RP_CLIENT_ID = ''
+OIDC_RP_CLIENT_SECRET = ''
+OIDC_RP_CLIENT_SECRET_ENCODED = True
+OIDC_OP_DOMAIN = 'http://127.0.0.1:8000'
+
 MANAGERS = ADMINS
 
 DEBUG = True
@@ -90,3 +98,6 @@ CSP_STYLE_SRC = base.CSP_STYLE_SRC + (
 BASKET_URL = 'http://127.0.0.1'
 BASKET_API_KEY = 'basket_api_key'
 BASKET_MANAGERS = None  # or list of email addresses.
+
+NORECAPTCHA_SITE_KEY = '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
+NORECAPTCHA_SECRET_KEY = '6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe'
diff --git a/mozillians/settings/local.py-docker-dist b/mozillians/settings/local.py-docker-dist
@@ -50,6 +50,14 @@ ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
 
+OIDC_OP_AUTHORIZATION_ENDPOINT = ''
+OIDC_OP_TOKEN_ENDPOINT = ''
+OIDC_OP_USER_ENDPOINT = ''
+OIDC_RP_CLIENT_ID = ''
+OIDC_RP_CLIENT_SECRET = ''
+OIDC_RP_CLIENT_SECRET_ENCODED = True
+OIDC_OP_DOMAIN = 'http://127.0.0.1:8000'
+
 MANAGERS = ADMINS
 
 DEBUG = True
@@ -116,3 +124,6 @@ CSP_STYLE_SRC = base.CSP_STYLE_SRC + (
     'http://*.mozilla.org',
     'http://*.mapbox.com',
 )
+
+NORECAPTCHA_SITE_KEY = '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
+NORECAPTCHA_SECRET_KEY = '6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe'