fix(elixir): Unify configs (#210)

.travis.yml

@@ -37,7 +37,6 @@ install:
 - npm install
 
 before_script:
-- cp config/travis.exs config/test.exs
 - mix do ecto.create, ecto.migrate
 
 script:
@@ -53,10 +52,9 @@ notifications:
   slack:
     secure: 0wrGLWdpp9HLujCNNwJnPvmfQmK3phQXbUj/EZ/x/YROEp1TdaDzLnXI4Qo6JyZszmH+zFb3S58iiOUrX2oCJFhdUGz/tN8YSBQBdMDPhi602BfarK4dfOSsnMq60KYzEV+zkM3GQFXIl/UudeZ5AhEpEn4tF6HrjSYqMOAJkjv4REesdY/GLDVSFfNF/KfXhd1afsB5IA5O0VMERr247aCtnr9pbHuE6yqicZCuw0aU41e3zPRm8BVUIP1np5jRaGCJs7Vpx/5Q+SpdTjqdtgB05APvHveupDJrGV2uVH2iXScxHIP5SZOJbaaUxkIvjjrMN4IW3IiFDjxDuN6PAFZfJ3mpTowtDl96t4fgOfTM9a/EVv7OlPeQAVkOvHIdfsZ2PUpGV7+yWN1RssyiaYxcHdJ825on2jb+lj7lhsZmlGDfa/8GhkPQuKJr/msaXaposYDa42460hinn4UPHGrgO4AuGrXF9Cc7/xbGIdAkHogsswYy1X2XDf7aDR5yktgz/sQ1aHnvF9K1SzopDd1TS6YjLpgN0Y4kqWrUqWxHM6Ne1mTYLTREfbs+49+oPaq+n+HilFB0BAjCpwtwvKi+VhPgH5ZCSYL0hqiYpsUNL2Q3oWUHra1YlPIc/2QtIf6E1XtpqADRqnI/Ow8XkTgi4xWq2gKmHn5jEZhW9Ng=
 
-after_success: 
+after_success:
 - |
   if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]];
-  then 
-    .travis/deploy.sh 
+  then
+    .travis/deploy.sh
   fi
-

Makefile

@@ -23,7 +23,6 @@ clean: ## Remove local files
 	rm -rf aion/node_modules
 
 test: ## Run tests
-	cp aion/config/local_test.exs aion/config/test.exs
 	cd aion && mix test
 
 lint: ## Run elixir linter
@@ -52,7 +51,7 @@ docker-stop: ## Stop docker container
 ## ~> LOCAL DEVELOPMENT PART <~ ##
 ##################################
 
-development: local-config local-deps local-db start-dev
+development: local-deps local-db start-dev
 development: ## Setup and run the whole project
 
 start-dev: ## Start the phoenix server
@@ -64,20 +63,17 @@ local-db: ## Create and migrate db locally
 local-deps: ## Download all needed dependencies
 	cd aion && mix deps.get && npm install && cd web/elm && $(elm-package) install -y
 
-local-config: ## Switch config file to the one containing settings for local use
-	cp aion/config/local_dev.exs aion/config/dev.exs
-	cp fixtures/src/local_config.py fixtures/src/config.py
 
 ##################################
 ## ~> DATABASE SEEDING PART <~  ##
 ##################################
 
 populate-database: ## Seed database with fixtures prepared in fixtures/jpks/
-populate-database: local-config
+populate-database:
 	cd fixtures && python3 main.py
 
 populate-rooms: ## Create a set of rooms aggregating all the questions present in the database
-populate-rooms: local-config
+populate-rooms:
 	cd fixtures && python3 main.py --rooms
 
 ##################################

aion/config/config.exs

@@ -34,6 +34,15 @@ config :guardian, Guardian,
   ttl: {30, :days},
   serializer: Aion.GuardianSerializer
 
+# Configures DB access
+config :aion, Aion.Repo,
+  adapter: Ecto.Adapters.Postgres,
+  username: "postgres",
+  password: "postgres",
+  database: "aion",
+  hostname: System.get_env("AION_DB_HOSTNAME") || "localhost",
+  pool_size: 10
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"

aion/config/dev.exs

@@ -24,14 +24,4 @@ config :aion, Aion.Endpoint,
     ]
   ]
 
-config :logger, :console, format: "[$level] $message\n"
-
 config :phoenix, :stacktrace_depth, 20
-
-config :aion, Aion.Repo,
-  adapter: Ecto.Adapters.Postgres,
-  username: "postgres",
-  password: "postgres",
-  database: "aion",
-  hostname: "localhost",
-  pool_size: 10

aion/config/prod.exs

@@ -5,13 +5,6 @@ config :aion, Aion.Endpoint,
   url: [host: "aion.mrapacz.pl", port: 8888],
   cache_static_manifest: "priv/static/manifest.json"
 
-config :aion, Aion.Repo,
-  adapter: Ecto.Adapters.Postgres,
-  username: "postgres",
-  password: "postgres",
-  database: "aion",
-  hostname: "localhost"
-
 config :phoenix, :serve_endpoints, true
 
 # Do not print debug messages in production

aion/config/test.exs

@@ -13,7 +13,7 @@ config :logger, level: :warn
 config :aion, Aion.Repo,
   adapter: Ecto.Adapters.Postgres,
   username: "postgres",
-  password: "postgres",
+  password: System.get_env("AION_TEST_DB_PASSWORD") || "postgres",
   database: "aion_test",
   hostname: "localhost",
   pool: Ecto.Adapters.SQL.Sandbox

docker-compose.yml

@@ -3,8 +3,8 @@ services:
   db:
     image: postgres:9.6
     environment:
-      POSTGRES_USER: root
-      POSTGRES_PASSWORD: password
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: aion
     volumes:
       - ./postgres-data:/var/lib/postgresql/data
@@ -14,6 +14,8 @@ services:
       dockerfile: Dockerfile
     depends_on:
       - db
+    environment:
+      - AION_DB_HOSTNAME="db"
     command: bash /scripts/run_server
     volumes:
       - ./aion/:/aion

fixtures/src/config.py

@@ -1,5 +1,6 @@
+import os
+
 dbname = 'aion'
 user = 'postgres'
 password = 'postgres'
-host = 'localhost'
-
+host = os.environ.get('AION_DB_HOSTNAME', 'localhost')

scripts/run_server

@@ -1,5 +1,4 @@
 sleep 2
-cp config/docker_dev.exs config/dev.exs
 cp fixtures/src/docker_config.py fixtures/src/config.py
 mix deps.get
 mix ecto.migrate