Browse Source

added configuration based on .env

Dominik 2 years ago
parent
commit
0a1cc30d31

File diff suppressed because it is too large
+ 6 - 4
README.md


+ 2 - 0
data/conf/conf.d/10-host.yml

@@ -0,0 +1,2 @@
+hosts:
+  - HOSTNAME

+ 0 - 3
data/conf/conf.d/10-macros.yml

@@ -1,3 +0,0 @@
-define_macro:
-  HOSTNAME: vc.s-up.net
-  IP_ADDRESS: 185.84.80.66

+ 0 - 2
data/conf/conf.d/20-hosts.yml

@@ -1,2 +0,0 @@
-hosts:
-  - HOSTNAME

+ 7 - 0
data/conf/conf.d/entrypoint.sh

@@ -0,0 +1,7 @@
+# If there is no ejabberd.yml copy it from the template
+# and set hostname and IP as per the variables set in .env
+[ ! -f ~/conf/ejabberd.yml ] \
+  && envsubst < ~/conf/ejabberd.yml.template > ~/conf/ejabberd.yml
+
+# Run ejabberdctl as done in the original entrypoint from the dockerfile
+/home/ejabberd/bin/ejabberdctl "$@"

+ 5 - 2
data/conf/ejabberd.yml.template

@@ -6,11 +6,14 @@
 ###       https://docs.ejabberd.im/admin/configuration
 ###
 
+define_macro:
+  HOSTNAME: $HOSTNAME
+  IP_ADDRESS: $IP_ADDRESS
+
 include_config_file:
-  - /home/ejabberd/conf/conf.d/10-macros.yml
+  - /home/ejabberd/conf/conf.d/10-host.yml
   - /home/ejabberd/conf/conf.d/15-log.yml
   - /home/ejabberd/conf/conf.d/16-shaper.yml
-  - /home/ejabberd/conf/conf.d/20-hosts.yml
   - /home/ejabberd/conf/conf.d/30-tls.yml
   - /home/ejabberd/conf/conf.d/31-auth.yml
   - /home/ejabberd/conf/conf.d/32-access.yml