diff --git a/data/hooks/conf_regen/02-ssl b/data/hooks/conf_regen/02-ssl index e3e30cb19..60acdbbbb 100755 --- a/data/hooks/conf_regen/02-ssl +++ b/data/hooks/conf_regen/02-ssl @@ -62,7 +62,7 @@ do_pre_regen() { cd /usr/share/yunohost/templates/ssl - install -D openssl.cnf "${pending_dir}/${ssl_dir}/openssl.cnf" + install -D -m 644 openssl.cnf "${pending_dir}/${ssl_dir}/openssl.cnf" } do_post_regen() { diff --git a/data/hooks/conf_regen/03-ssh b/data/hooks/conf_regen/03-ssh index 6fb6953ce..a469b7a66 100755 --- a/data/hooks/conf_regen/03-ssh +++ b/data/hooks/conf_regen/03-ssh @@ -13,7 +13,7 @@ do_pre_regen() { [[ -f /proc/net/if_inet6 ]] \ || sed -i "s/ListenAddress ::/#ListenAddress ::/g" sshd_config - install -D sshd_config "${pending_dir}/etc/ssh/sshd_config" + install -D -m 644 sshd_config "${pending_dir}/etc/ssh/sshd_config" fi } diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd index f4bda09da..4316de5e4 100755 --- a/data/hooks/conf_regen/06-slapd +++ b/data/hooks/conf_regen/06-slapd @@ -35,15 +35,16 @@ do_pre_regen() { [ ! -f /etc/ldap/slapd-yuno.conf ] \ || touch "${pending_dir}/etc/ldap/slapd-yuno.conf" + # create needed directories ldap_dir="${pending_dir}/etc/ldap" - install -D ldap.conf "${ldap_dir}/ldap.conf" - install -D slapd.conf "${ldap_dir}/slapd.conf" - schema_dir="${ldap_dir}/schema" - install -D sudo.schema "${schema_dir}/sudo.schema" - install -D mailserver.schema "${schema_dir}/mailserver.schema" + mkdir -p "$ldap_dir" "$schema_dir" - install -D slapd.default "${pending_dir}/etc/default/slapd" + # copy configuration files + cp -a ldap.conf slapd.conf "$ldap_dir" + cp -a sudo.schema mailserver.schema "$schema_dir" + + install -D -m 644 slapd.default "${pending_dir}/etc/default/slapd" } do_post_regen() { diff --git a/data/hooks/conf_regen/09-nslcd b/data/hooks/conf_regen/09-nslcd index a008c4288..5071ac1fd 100755 --- a/data/hooks/conf_regen/09-nslcd +++ b/data/hooks/conf_regen/09-nslcd @@ -7,7 +7,7 @@ do_pre_regen() { cd /usr/share/yunohost/templates/nslcd - install -D nslcd.conf "${pending_dir}/etc/nslcd.conf" + install -D -m 644 nslcd.conf "${pending_dir}/etc/nslcd.conf" } do_post_regen() { diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter index 9d6df61d7..bc225d530 100755 --- a/data/hooks/conf_regen/28-rmilter +++ b/data/hooks/conf_regen/28-rmilter @@ -7,8 +7,8 @@ do_pre_regen() { cd /usr/share/yunohost/templates/rmilter - install -D rmilter.conf "${pending_dir}/etc/rmilter.conf" - install -D rmilter.socket "${pending_dir}/etc/rmilter.socket" + install -D -m 644 rmilter.conf "${pending_dir}/etc/rmilter.conf" + install -D -m 644 rmilter.socket "${pending_dir}/etc/rmilter.socket" } do_post_regen() { diff --git a/data/hooks/conf_regen/31-rspamd b/data/hooks/conf_regen/31-rspamd index 1ea777de8..327bedef1 100755 --- a/data/hooks/conf_regen/31-rspamd +++ b/data/hooks/conf_regen/31-rspamd @@ -7,9 +7,9 @@ do_pre_regen() { cd /usr/share/yunohost/templates/rspamd - install -D metrics.local.conf \ + install -D -m 644 metrics.local.conf \ "${pending_dir}/etc/rspamd/local.d/metrics.conf" - install -D rspamd.sieve \ + install -D -m 644 rspamd.sieve \ "${pending_dir}/etc/dovecot/global_script/rspamd.sieve" } diff --git a/data/hooks/conf_regen/34-mysql b/data/hooks/conf_regen/34-mysql index 1b84c8aba..7905035fb 100755 --- a/data/hooks/conf_regen/34-mysql +++ b/data/hooks/conf_regen/34-mysql @@ -7,7 +7,7 @@ do_pre_regen() { cd /usr/share/yunohost/templates/mysql - install -D my.cnf "${pending_dir}/etc/mysql/my.cnf" + install -D -m 644 my.cnf "${pending_dir}/etc/mysql/my.cnf" } do_post_regen() { diff --git a/data/hooks/conf_regen/37-avahi-daemon b/data/hooks/conf_regen/37-avahi-daemon index 113e9e0c7..655a2e054 100755 --- a/data/hooks/conf_regen/37-avahi-daemon +++ b/data/hooks/conf_regen/37-avahi-daemon @@ -7,7 +7,8 @@ do_pre_regen() { cd /usr/share/yunohost/templates/avahi-daemon - install -D avahi-daemon.conf "${pending_dir}/etc/avahi/avahi-daemon.conf" + install -D -m 644 avahi-daemon.conf \ + "${pending_dir}/etc/avahi/avahi-daemon.conf" } do_post_regen() { diff --git a/data/hooks/conf_regen/40-glances b/data/hooks/conf_regen/40-glances index e7d6b07b9..a19d35d56 100755 --- a/data/hooks/conf_regen/40-glances +++ b/data/hooks/conf_regen/40-glances @@ -7,7 +7,7 @@ do_pre_regen() { cd /usr/share/yunohost/templates/glances - install -D glances.default "${pending_dir}/etc/default/glances" + install -D -m 644 glances.default "${pending_dir}/etc/default/glances" } do_post_regen() { diff --git a/data/hooks/conf_regen/46-nsswitch b/data/hooks/conf_regen/46-nsswitch index 9cbcae13d..db3a2199a 100755 --- a/data/hooks/conf_regen/46-nsswitch +++ b/data/hooks/conf_regen/46-nsswitch @@ -7,7 +7,7 @@ do_pre_regen() { cd /usr/share/yunohost/templates/nsswitch - install -D nsswitch.conf "${pending_dir}/etc/nsswitch.conf" + install -D -m 644 nsswitch.conf "${pending_dir}/etc/nsswitch.conf" } do_post_regen() {