diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-01 02:06:41 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-01 03:17:30 +0300 |
| commit | 7f7ccb9352ce9acb48c81d7f796787bb48c87921 (patch) | |
| tree | e63fd5c5ac6537c11cd5c678f0d12430a2acd54f /res/rz-mux/rhizi-conf-template.d | |
| parent | 1831e3b807045e9259c694a713f701555eacb9bc (diff) | |
rz-mux-tool: rename domain_name -> domain_fqdn
Diffstat (limited to 'res/rz-mux/rhizi-conf-template.d')
3 files changed, 7 insertions, 7 deletions
diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja index ecce23a5..35dac2de 100644 --- a/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja +++ b/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja @@ -1,7 +1,7 @@ #!/bin/sh -bkp_dir=/var/lib/rhizi/mux-bkp.d/{{ domain_name }} -bkp_filename={{ domain_name }}-bkp_$(date +%Y-%m-%d).dump +bkp_dir=/var/lib/rhizi/mux-bkp.d/{{ domain_fqdn }} +bkp_filename={{ domain_fqdn }}-bkp_$(date +%Y-%m-%d).dump bkp_filepath=${bkp_dir}/${bkp_filename} # dump neo4j DB diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja index 9a07dc44..a19de2ee 100644 --- a/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja +++ b/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja @@ -17,7 +17,7 @@ static_url_path = /static # listen_address = 127.0.0.1 listen_port = {{ rz_port__http }} -reverse_proxy_host = {{ domain_name }}.rhizi.net +reverse_proxy_host = {{ domain_fqdn }}.rhizi.net reverse_proxy_port = 80 # ----------------------------------------------------------------------------- @@ -29,7 +29,7 @@ neo4j_url = http://127.0.0.1:{{ neo4j_port__http }} # Logging # log_level = debug -log_path = /var/log/rhizi/rhizi-server__{{ domain_name }}.log +log_path = /var/log/rhizi/rhizi-server__{{ domain_fqdn }}.log # ----------------------------------------------------------------------------- # Flask Configuration diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja index 134b5baf..bdbbb648 100644 --- a/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja +++ b/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja @@ -1,7 +1,7 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: rhizi__{{ domain_name }} +# Provides: rhizi__{{ domain_fqdn }} # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: 2 3 4 5 @@ -15,14 +15,14 @@ # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="rhizi-server" -NAME=rhizi__{{ domain_name }} +NAME=rhizi__{{ domain_fqdn }} DAEMON=/usr/bin/python2.7 PIDFILE=/var/run/rhizi/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME USERNAME=www-data GROUPNAME=www-data -ARGS__DAEMON="/usr/lib/rhizi/rhizi-server/rz_server.py --config-dir=/etc/rhizi/mux-conf.d/{{ domain_name }}/" +ARGS__DAEMON="/usr/lib/rhizi/rhizi-server/rz_server.py --config-dir=/etc/rhizi/mux-conf.d/{{ domain_fqdn }}/" ARGS__START_STOP_DAEMON="--make-pidfile --background --chuid ${USERNAME}:${GROUPNAME}" # Exit if the package is not installed |