Browse Source

etc/{host}/sys.config

Namdak Tonpa 9 years ago
parent
commit
c0742d8227
4 changed files with 4 additions and 2 deletions
  1. 1 1
      include/mad.hrl
  2. BIN
      mad
  3. 2 0
      src/mad.erl
  4. 1 1
      src/provision/mad_repl.erl

+ 1 - 1
include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"7c7e76").
+-define(VERSION,"670539").

BIN
mad


+ 2 - 0
src/mad.erl

@@ -50,6 +50,8 @@ return(true)      -> 1;
 return(false)     -> 0;
 return(X)         -> X.
 
+host()            -> Host = try {ok,H} = inet:gethostname(), H catch _:_ -> <<>> end.
+
 info(Format)      -> io:format(lists:concat([Format,"\r"])).
 info(Format,Args) -> io:format(lists:concat([Format,"\r"]),Args).
 

+ 1 - 1
src/provision/mad_repl.erl

@@ -27,7 +27,7 @@ parse_applist(AppList) ->
    [ list_to_atom(R) || R <-Res ]  -- disabled().
 
 load_config() ->
-   Config = wildcards(["sys.config"]),
+   Config = wildcards(["sys.config",lists:concat(["etc/",mad:host(),"/sys.config"])]),
    Apps = case Config of
         [] -> case mad_repl:load_file("sys.config") of
               {error,_} -> [];