@@ -27,65 +27,65 @@ defmodule Caddy.Config do
2727 defdelegate user_home , to: System
2828
2929 @ doc "Get configurable base path for caddy files"
30- def base_path ( ) do
30+ def base_path do
3131 Application . get_env ( :caddy , :base_path , Path . join ( user_home ( ) , ".local/share/caddy" ) )
3232 end
3333
3434 @ doc "Get configurable priv path"
35- def priv_path ( ) do
35+ def priv_path do
3636 Application . get_env ( :caddy , :priv_path , Application . app_dir ( :caddy , "priv" ) )
3737 end
3838
3939 @ doc "Get share path (base path)"
40- def share_path ( ) , do: base_path ( )
40+ def share_path , do: base_path ( )
4141
4242 @ doc "Get etc path for configuration files"
43- def etc_path ( ) do
43+ def etc_path do
4444 Application . get_env ( :caddy , :etc_path , Path . join ( base_path ( ) , "etc" ) )
4545 end
4646
4747 @ doc "Get run path for runtime files"
48- def run_path ( ) do
48+ def run_path do
4949 Application . get_env ( :caddy , :run_path , Path . join ( base_path ( ) , "run" ) )
5050 end
5151
5252 @ doc "Get tmp path for temporary files"
53- def tmp_path ( ) do
53+ def tmp_path do
5454 Application . get_env ( :caddy , :tmp_path , Path . join ( base_path ( ) , "tmp" ) )
5555 end
5656
5757 @ doc "Get XDG config home path"
58- def xdg_config_home ( ) do
58+ def xdg_config_home do
5959 Application . get_env ( :caddy , :xdg_config_home , Path . join ( base_path ( ) , "config" ) )
6060 end
6161
6262 @ doc "Get XDG data home path"
63- def xdg_data_home ( ) do
63+ def xdg_data_home do
6464 Application . get_env ( :caddy , :xdg_data_home , Path . join ( base_path ( ) , "data" ) )
6565 end
6666
6767 @ doc "Get environment file path"
68- def env_file ( ) do
68+ def env_file do
6969 Application . get_env ( :caddy , :env_file , Path . join ( etc_path ( ) , "envfile" ) )
7070 end
7171
7272 @ doc "Get init configuration file path"
73- def init_file ( ) do
73+ def init_file do
7474 Application . get_env ( :caddy , :init_file , Path . join ( etc_path ( ) , "init.json" ) )
7575 end
7676
7777 @ doc "Get PID file path"
78- def pid_file ( ) do
78+ def pid_file do
7979 Application . get_env ( :caddy , :pid_file , Path . join ( run_path ( ) , "caddy.pid" ) )
8080 end
8181
8282 @ doc "Get socket file path"
83- def socket_file ( ) do
83+ def socket_file do
8484 Application . get_env ( :caddy , :socket_file , Path . join ( run_path ( ) , "caddy.sock" ) )
8585 end
8686
8787 @ doc "Get saved JSON configuration file path"
88- def saved_json_file ( ) do
88+ def saved_json_file do
8989 Application . get_env (
9090 :caddy ,
9191 :saved_json_file ,
@@ -94,10 +94,10 @@ defmodule Caddy.Config do
9494 end
9595
9696 @ doc false
97- def paths ( ) , do: [ priv_path ( ) , share_path ( ) , etc_path ( ) , run_path ( ) , tmp_path ( ) ]
97+ def paths , do: [ priv_path ( ) , share_path ( ) , etc_path ( ) , run_path ( ) , tmp_path ( ) ]
9898
9999 @ doc false
100- def ensure_path_exists ( ) do
100+ def ensure_path_exists do
101101 paths ( )
102102 |> Enum . reduce_while ( true , fn path , _acc ->
103103 case File . mkdir_p ( path ) do
@@ -214,7 +214,7 @@ defmodule Caddy.Config do
214214
215215 @ doc "Get backup file path"
216216 @ spec backup_json_file ( ) :: Path . t ( )
217- def backup_json_file ( ) do
217+ def backup_json_file do
218218 Application . get_env (
219219 :caddy ,
220220 :backup_json_file ,
@@ -232,7 +232,7 @@ defmodule Caddy.Config do
232232
233233 #{ Enum . join ( additional , "\n \n " ) }
234234
235- #{ Enum . map ( sites , fn
235+ #{ Enum . map_join ( sites , " \n \n " , fn
236236 { name , site } when is_binary ( site ) -> """
237237 ## #{ name }
238238 #{ name } {
@@ -246,7 +246,7 @@ defmodule Caddy.Config do
246246 }
247247 """
248248 _ -> ""
249- end ) |> Enum . join ( " \n \n " ) }
249+ end ) }
250250 """
251251 end
252252
@@ -427,7 +427,7 @@ defmodule Caddy.Config do
427427 end
428428
429429 @ doc false
430- def init_env ( ) do
430+ def init_env do
431431 [
432432 { "HOME" , share_path ( ) } ,
433433 { "XDG_CONFIG_HOME" , xdg_config_home ( ) } ,
0 commit comments