Short config variables

apps/epp_proxy/src/epp_proxy_sup.erl

@@ -14,6 +14,18 @@
 -export([init/1]).
 
 -define(SERVER, ?MODULE).
+-define(TCPPort,
+        case application:get_env(epp_proxy, tcp_port) of
+            undefined -> undefined;
+            {ok, Value} -> Value
+            end).
+
+-define(TLSPort,
+        case application:get_env(epp_proxy, tls_port) of
+            undefined -> undefined;
+            {ok, Val} -> Val
+            end).
+
 
 %%====================================================================
 %% API functions
@@ -35,11 +47,11 @@ init([]) ->
     TCPAcceptor = #{id => epp_tcp_acceptor,
             type => worker,
             modules => [epp_tcp_acceptor],
-            start => {epp_tcp_acceptor, start_link, [3333]}},
+            start => {epp_tcp_acceptor, start_link, [?TCPPort]}},
     TLSAcceptor = #{id => epp_tls_acceptor,
             type => worker,
             modules => [epp_tls_acceptor],
-            start => {epp_tls_acceptor, start_link, [4444]}},
+            start => {epp_tls_acceptor, start_link, [?TLSPort]}},
     PoolSupervisor = #{id => epp_pool_supervisor,
             type => supervisor,
             modules => [epp_pool_supervisor],

apps/epp_proxy/src/epp_tls_acceptor.erl

@@ -7,18 +7,18 @@
 -define(WORKER, epp_tls_worker).
 
 -define(CaCertFile,
-        case application:get_env(epp_proxy, epp_cacertfile_path) of
+        case application:get_env(epp_proxy, cacertfile_path) of
             undefined -> undefined;
             {ok, Value} -> Value
             end).
 
 -define(CertFile,
-        case application:get_env(epp_proxy, epp_certfile_path) of
+        case application:get_env(epp_proxy, certfile_path) of
             undefined -> undefined;
             {ok, Value} -> Value
             end).
 -define(KeyFile,
-        case application:get_env(epp_proxy, epp_keyfile_path) of
+        case application:get_env(epp_proxy, keyfile_path) of
             undefined -> undefined;
             {ok, Value} -> Value
             end).

config/sys.config

@@ -3,7 +3,7 @@
                {tls_port, 4444},
                {epp_session_url, "https://registry.test/epp/session/"},
                {epp_command_url, "https://registry.test/epp/command/"},
-               {epp_cacertfile_path, "/Users/maciej/Development/internetee/docker-images/shared/ca/certs/ca.crt.pem"},
+               {cacertfile_path, "/Users/maciej/Development/internetee/docker-images/shared/ca/certs/ca.crt.pem"},
-               {epp_certfile_path, "/Users/maciej/Development/internetee/docker-images/shared/ca/certs/apache.crt"},
+               {certfile_path, "/Users/maciej/Development/internetee/docker-images/shared/ca/certs/apache.crt"},
-               {epp_keyfile_path, "/Users/maciej/Development/internetee/docker-images/shared/ca/private/apache.key"}]}
+               {keyfile_path, "/Users/maciej/Development/internetee/docker-images/shared/ca/private/apache.key"}]}
 ].