diff --git a/conf/checksetup_answers.txt b/conf/checksetup_answers.txt --- a/conf/checksetup_answers.txt +++ b/conf/checksetup_answers.txt @@ -20,7 +20,7 @@ $answer{'size_limit'} = 750000; $answer{'skin'} = 'Mozilla'; $answer{'upgrade_notification'} = 'disabled'; -$answer{'urlbase'} = 'http://bmo.test/'; +$answer{'urlbase'} = 'http://localhost:8000/'; $answer{'usebugaliases'} = 1; $answer{'useclassification'} = 1; $answer{'user_info_class'} = 'GitHubAuth,CGI'; @@ -30,14 +30,14 @@ $answer{'utf8'} = 'utf8mb4'; $answer{'webdotbase'} = '/usr/bin/dot'; -$answer{'mozilla_iam_enabled'} = 1; +$answer{'mozilla_iam_enabled'} = 0; $answer{'mozilla_iam_person_api_uri'} = 'http://externalapi.test:8000/person/test'; $answer{'mozilla_iam_person_api_client_id'} = 'client_id'; $answer{'mozilla_iam_person_api_client_secret'} = 'client_secret'; $answer{'mozilla_iam_mandatory_domains'} = 'mozilla.com'; $answer{'oauth2_client_authorize_url'} = 'http://externalapi.test:8000/oauth/test/authorize'; -$answer{'oauth2_client_enabled'} = 1; +$answer{'oauth2_client_enabled'} = 0; $answer{'oauth2_client_id'} = 'client_id'; $answer{'oauth2_client_scopes'} = 'openid profile email'; $answer{'oauth2_client_secret'} = 'client_secret'; diff --git a/docker-compose.yml b/docker-compose.yml --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ - BMO_memcached_servers=memcached:11211 - BMO_ses_username=ses@mozilla.bugs - BMO_ses_password=password123456789! - - BMO_urlbase=http://bmo.test/ + - BMO_urlbase=http://localhost:8000/ - BUGZILLA_ALLOW_INSECURE_HTTP=1 - BZ_ANSWERS_FILE=/app/conf/checksetup_answers.txt - HTTP_BACKEND=morbo @@ -38,7 +38,8 @@ depends_on: - bmo.db - memcached - - proxy + ports: + - 8000:8000 bmo.jobqueue: build: *bmo_build @@ -129,14 +130,6 @@ memcached: image: memcached:latest - proxy: - image: haproxytech/haproxy-alpine - volumes: - - ./docker/proxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro - ports: - - "1080:1080" - restart: always - volumes: bmo-mysql-db: bmo-data-dir: