HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
boostrap: fail on error, create cert for local machine
[hcoop/domtool2.git]
/
scripts
/
domtool-publish
diff --git
a/scripts/domtool-publish
b/scripts/domtool-publish
index
7518281
..
9a9a01a
100755
(executable)
--- a/
scripts/domtool-publish
+++ b/
scripts/domtool-publish
@@
-40,8
+40,8
@@
case $1 in
/usr/bin/rsync -r --delete /var/domtool/zones/ /etc/bind/zones/
/bin/chown -R bind /etc/bind/zones
/bin/cp /var/domtool/named.conf.local /etc/bind/
/usr/bin/rsync -r --delete /var/domtool/zones/ /etc/bind/zones/
/bin/chown -R bind /etc/bind/zones
/bin/cp /var/domtool/named.conf.local /etc/bind/
- /bin/chown root:bind
_config
/etc/bind/named.conf.local
- /bin/chmod
u=rw,g=rw,o=r
/etc/bind/named.conf.local
+ /bin/chown root:bind /etc/bind/named.conf.local
+ /bin/chmod
644
/etc/bind/named.conf.local
/etc/init.d/bind9 restart
;;
exim)
/etc/init.d/bind9 restart
;;
exim)
@@
-58,7
+58,7
@@
case $1 in
;;
courier)
/usr/sbin/makeuserdb
;;
courier)
/usr/sbin/makeuserdb
- /bin/chown -R domtool.
domtool
/etc/courier/userdb
+ /bin/chown -R domtool.
nogroup
/etc/courier/userdb
/bin/cat /etc/courier/userdb/* >/etc/courier/exim
/bin/chmod o-r /etc/courier/exim
/usr/sbin/exim_dbmbuild /etc/courier/exim /etc/courier/exim.dat
/bin/cat /etc/courier/userdb/* >/etc/courier/exim
/bin/chmod o-r /etc/courier/exim
/usr/sbin/exim_dbmbuild /etc/courier/exim /etc/courier/exim.dat
@@
-69,16
+69,21
@@
case $1 in
/bin/grep $2 /var/log/exim4/mainlog
;;
apache-fixperms)
/bin/grep $2 /var/log/exim4/mainlog
;;
apache-fixperms)
- /bin/chown -R domtool.
domtool
/var/log/apache2/user
+ /bin/chown -R domtool.
nogroup
/var/log/apache2/user
;;
apache1.3-fixperms)
;;
apache1.3-fixperms)
- /bin/chown -R domtool.
domtool
/var/log/apache/user
+ /bin/chown -R domtool.
nogroup
/var/log/apache/user
;;
users)
/bin/cp /var/domtool/waklog.conf /etc/apache2/
/etc/init.d/apache2 reload
;;
firewall)
;;
users)
/bin/cp /var/domtool/waklog.conf /etc/apache2/
/etc/init.d/apache2 reload
;;
firewall)
+ # Ideally this would check if the config worked first
+ # (ferm failing just uses the previous config at
+ # least). Does it need to chown/chmod the generated
+ # rules?
+ /bin/cp /var/domtool/firewall/*.conf /etc/ferm/
/etc/init.d/ferm reload
;;
*)
/etc/init.d/ferm reload
;;
*)