YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Various fixes on configuration regeneration

Browse source
This commit is contained in:
kload 2015-09-30 19:36:55 -04:00
parent b615bcb810
commit 15533c7c6f
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/actionsmap/yunohost.yml
View file

@ -264,6 +264,7 @@ domain:
action_help: Create a custom domain action_help: Create a custom domain
api: POST /domains api: POST /domains
configuration: configuration:
lock: false
authenticate: all authenticate: all
arguments: arguments:
domain: domain:
@ -282,6 +283,7 @@ domain:
action_help: Delete domains action_help: Delete domains
api: DELETE /domains/<domain> api: DELETE /domains/<domain>
configuration: configuration:
lock: false
authenticate: all authenticate: all
arguments: arguments:
domain: domain:

4
data/hooks/conf_regen/12-metronome
View file

@ -63,8 +63,8 @@ for file in /etc/metronome/conf.d/*; do
| sed 's|.cfg.lua||') | sed 's|.cfg.lua||')
sanitzed_domain="$(echo $domain | sed 's/\./%2e/g')" sanitzed_domain="$(echo $domain | sed 's/\./%2e/g')"
[[ $domain_list =~ $domain ]] \ [[ $domain_list =~ $domain ]] \
|| $(sudo yunohost service saferemove -s metronome $file) == "True" \ || ($(sudo yunohost service saferemove -s metronome $file) == "True" \
&& rm -rf /var/lib/metronome/$sanitzed_domain && rm -rf /var/lib/metronome/$sanitzed_domain)
done done

7
data/hooks/conf_regen/15-nginx
View file

@ -37,9 +37,10 @@ safe_copy yunohost_local.conf \
need_restart=False need_restart=False
domain_list=$(sudo yunohost domain list --raw)
# Copy a configuration file for each YunoHost domain # Copy a configuration file for each YunoHost domain
for domain in $(sudo yunohost domain list --raw); do for domain in $domain_list; do
sudo mkdir -p /etc/nginx/conf.d/$domain.d sudo mkdir -p /etc/nginx/conf.d/$domain.d
cat server.conf.sed \ cat server.conf.sed \
| sed "s/{{ domain }}/$domain/g" \ | sed "s/{{ domain }}/$domain/g" \
@ -55,8 +56,8 @@ for file in /etc/nginx/conf.d/*.*.conf; do
| sed 's|/etc/nginx/conf.d/||' \ | sed 's|/etc/nginx/conf.d/||' \
| sed 's|.conf||') | sed 's|.conf||')
[[ $domain_list =~ $domain ]] \ [[ $domain_list =~ $domain ]] \
|| $(sudo yunohost service saferemove -s nginx $file) == "True" \ || ($(sudo yunohost service saferemove -s nginx $file) == "True" \
&& (rm -r /etc/nginx/conf.d/$domain.d || true) && (rm -r /etc/nginx/conf.d/$domain.d || true))
done done
# Restart if need be # Restart if need be

4
data/hooks/conf_regen/43-dnsmasq
View file

@ -24,8 +24,10 @@ ipv6=$(ip route get 2000:: | grep -q "unreachable" && echo '' \
sudo mkdir -p /etc/dnsmasq.d sudo mkdir -p /etc/dnsmasq.d
domain_list=$(sudo yunohost domain list --raw)
# Copy a configuration file for each YunoHost domain # Copy a configuration file for each YunoHost domain
for domain in $(sudo yunohost domain list --raw); do for domain in $domain_list; do
cat domain.sed \ cat domain.sed \
| sed "s/{{ domain }}/$domain/g" \ | sed "s/{{ domain }}/$domain/g" \
| sed "s/{{ ip }}/$ip/g" \ | sed "s/{{ ip }}/$ip/g" \

5
lib/yunohost/service.py
View file

@ -466,11 +466,6 @@ def service_saferemove(service, conf_file, force=False):
deleted = True deleted = True
msignals.display(m18n.n('service_configuration_backup', conf_backup_file), msignals.display(m18n.n('service_configuration_backup', conf_backup_file),
'info') 'info')
elif keep:
services[service]['conffiles'][conf_file] = \
previous_hash[0:32] + ', but keep ' + current_hash
msignals.display(m18n.n('service_configuration_backup', conf_backup_file),
'info')
else: else:
services[service]['conffiles'][conf_file] = previous_hash services[service]['conffiles'][conf_file] = previous_hash
os.remove(conf_backup_file) os.remove(conf_backup_file)