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

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2015-10-31 18:04:19 +01:00
commit 690b9a720c
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@ for domain in $domain_list; do
cat domain.cfg.lua.sed \ cat domain.cfg.lua.sed \
| sed "s/{{ domain }}/$domain/g" \ | sed "s/{{ domain }}/$domain/g" \
| sudo tee $domain.cfg.lua | sudo tee $domain.cfg.lua
if [[ $(safe_copy $domain.cfg.lua /etc/metronome/conf.d/$domain.cfg.lua) == "True" ]]; then if [[ $(safe_copy $domain.cfg.lua /etc/metronome/conf.d/$domain.cfg.lua | tail -n1) == "True" ]]; then
need_restart=True need_restart=True
fi fi
done done
@ -50,7 +50,7 @@ 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 | tail -n1) == "True" \
&& rm -rf /var/lib/metronome/$sanitzed_domain) && rm -rf /var/lib/metronome/$sanitzed_domain)
done done

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

@ -45,7 +45,7 @@ if [ -f /etc/yunohost/installed ]; then
cat server.conf.sed \ cat server.conf.sed \
| sed "s/{{ domain }}/$domain/g" \ | sed "s/{{ domain }}/$domain/g" \
| sudo tee $domain.conf | sudo tee $domain.conf
[[ $(safe_copy $domain.conf /etc/nginx/conf.d/$domain.conf) == "True" ]] \ [[ $(safe_copy $domain.conf /etc/nginx/conf.d/$domain.conf | tail -n1) == "True" ]] \
&& need_restart=True && need_restart=True
[ -f /etc/nginx/conf.d/$domain.d/yunohost_local.conf ] \ [ -f /etc/nginx/conf.d/$domain.d/yunohost_local.conf ] \

2
data/hooks/conf_regen/34-mysql
View file

@ -21,7 +21,7 @@ function randpass () {
cd /usr/share/yunohost/templates/mysql cd /usr/share/yunohost/templates/mysql
if [[ "$(safe_copy my.cnf /etc/mysql/my.cnf)" == "True" ]]; then if [[ "$(safe_copy my.cnf /etc/mysql/my.cnf | tail -n1)" == "True" ]]; then
sudo service mysql restart sudo service mysql restart
fi fi

2
data/hooks/conf_regen/37-avahi-daemon
View file

@ -15,6 +15,6 @@ function safe_copy () {
cd /usr/share/yunohost/templates/avahi-daemon cd /usr/share/yunohost/templates/avahi-daemon
if [[ "$(safe_copy avahi-daemon.conf /etc/avahi/avahi-daemon.conf)" == "True" ]]; then if [[ "$(safe_copy avahi-daemon.conf /etc/avahi/avahi-daemon.conf | tail -n1)" == "True" ]]; then
sudo service avahi-daemon restart sudo service avahi-daemon restart
fi fi

2
data/hooks/conf_regen/40-glances
View file

@ -15,6 +15,6 @@ function safe_copy () {
cd /usr/share/yunohost/templates/glances cd /usr/share/yunohost/templates/glances
if [[ "$(safe_copy glances.default /etc/default/glances)" == "True" ]]; then if [[ "$(safe_copy glances.default /etc/default/glances | tail -n1)" == "True" ]]; then
sudo service glances restart sudo service glances restart
fi fi

2
data/hooks/conf_regen/46-nsswitch
View file

@ -15,6 +15,6 @@ function safe_copy () {
cd /usr/share/yunohost/templates/nsswitch cd /usr/share/yunohost/templates/nsswitch
if [[ "$(safe_copy nsswitch.conf /etc/nsswitch.conf)" == "True" ]]; then if [[ "$(safe_copy nsswitch.conf /etc/nsswitch.conf | tail -n1)" == "True" ]]; then
sudo service nscd restart sudo service nscd restart
fi fi

2
data/hooks/conf_regen/49-udisks-glue
View file

@ -15,6 +15,6 @@ function safe_copy () {
cd /usr/share/yunohost/templates/udisks-glue cd /usr/share/yunohost/templates/udisks-glue
if [[ "$(safe_copy udisks-glue.conf /etc/udisks-glue.conf)" == "True" ]]; then if [[ "$(safe_copy udisks-glue.conf /etc/udisks-glue.conf | tail -n1)" == "True" ]]; then
sudo service udisks-glue restart sudo service udisks-glue restart
fi fi

2
data/hooks/conf_regen/52-fail2ban
View file

@ -24,6 +24,6 @@ version=$(sed 's/\..*//' /etc/debian_version)
&& sudo cp jail-jessie.conf jail.conf \ && sudo cp jail-jessie.conf jail.conf \
|| sudo cp jail-wheezy.conf jail.conf || sudo cp jail-wheezy.conf jail.conf
if [[ $(safe_copy jail.conf /etc/fail2ban/jail.conf) == "True" ]]; then if [[ $(safe_copy jail.conf /etc/fail2ban/jail.conf | tail -n1) == "True" ]]; then
sudo service fail2ban restart sudo service fail2ban restart
fi fi