Commit 2345c330 authored by Marco Mariani's avatar Marco Mariani

actually call setcap and zmsetup.pl from buildout

parent 1d6a771c
...@@ -303,14 +303,12 @@ command = ...@@ -303,14 +303,12 @@ command =
chmod 1777 data/tmp chmod 1777 data/tmp
mkdir backup ssl .ssh zmstat mkdir backup ssl .ssh zmstat
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
[zimbra-unpack-ldap] [zimbra-unpack-ldap]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
# export ZIMBRA_INSTALLED_PKGS="zimbra-core zimbra-ldap"
# TODO:
# sudo setcap 'cap_net_bind_service=+ep' /home/marco/zbuild/zimbra-home/openldap/sbin/slapd
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = True stop-on-error = True
PACKAGE_LIST = zimbra-core zimbra-ldap PACKAGE_LIST = zimbra-core zimbra-ldap
...@@ -347,15 +345,15 @@ command = ...@@ -347,15 +345,15 @@ command =
mkdir -p data/ldap/mdb/db mkdir -p data/ldap/mdb/db
sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/openldap/sbin/slapd sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/openldap/sbin/slapd
# clear credential cache to spot commands in zmsetup.pl that would require sudo
sudo -k
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
[zimbra-unpack-mta] [zimbra-unpack-mta]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
# export ZIMBRA_INSTALLED_PKGS="zimbra-core zimbra-mta"
# TODO:
# sudo setcap 'cap_net_bind_service=+ep' zimbra-home/postfix/libexec/master
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = True stop-on-error = True
PACKAGE_LIST = zimbra-core zimbra-mta PACKAGE_LIST = zimbra-core zimbra-mta
...@@ -393,20 +391,27 @@ command = ...@@ -393,20 +391,27 @@ command =
ln -sf tcmalloc-* tcmalloc ln -sf tcmalloc-* tcmalloc
ln -sf jdk* java ln -sf jdk* java
ln -sf zeromq* zeromq ln -sf zeromq* zeromq
mkdir -p data/amavisd/db mkdir -p data/amavisd/db
mkdir -p data/amavisd/tmp mkdir -p data/amavisd/tmp
mkdir -p data/amavisd/var mkdir -p data/amavisd/var
mkdir -p data/amavisd/quarantine mkdir -p data/amavisd/quarantine
mkdir -p data/clamav/db mkdir -p data/clamav/db
mkdir -p data/postfix/spool/pid mkdir -p data/postfix/spool/pid
mkdir -p data/tmp mkdir -p data/tmp
chmod 1777 data/tmp chmod 1777 data/tmp
touch ${:ZIMBRA_HOME}/postfix/conf/main.cf touch ${:ZIMBRA_HOME}/postfix/conf/main.cf
sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/postfix/libexec/master
# clear credential cache to spot commands in zmsetup.pl that would require sudo
sudo -k
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
# TODO # TODO
# touch postfix/conf/main.cf
# ln -s /home/marco/zbuild/zimbra-home/postfix/conf/aliases /etc/aliases # ln -s /home/marco/zbuild/zimbra-home/postfix/conf/aliases /etc/aliases
# see also # see also
...@@ -415,15 +420,8 @@ command = ...@@ -415,15 +420,8 @@ command =
[zimbra-unpack-all] [zimbra-unpack-all]
# extract binaries and scripts from the .deb packages # extract binaries and scripts from the .deb packages
# export ZIMBRA_INSTALLED_PKGS="zimbra-core zimbra-ldap zimbra-mta zimbra-store"
# TODO:
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = True stop-on-error = True
PACKAGE_LIST = zimbra-core zimbra-ldap zimbra-mta zimbra-store PACKAGE_LIST = zimbra-core zimbra-ldap zimbra-mta zimbra-store
...@@ -465,10 +463,6 @@ command = ...@@ -465,10 +463,6 @@ command =
ln -sf jetty-distribution-* mailboxd ln -sf jetty-distribution-* mailboxd
ln -sf zeromq* zeromq ln -sf zeromq* zeromq
mkdir -p data/tmp
chmod 1777 data/tmp
touch ${:ZIMBRA_HOME}/postfix/conf/main.cf
mkdir backup ssl .ssh zmstat
mkdir -p data/ldap/config mkdir -p data/ldap/config
mkdir -p data/ldap/mdb/db mkdir -p data/ldap/mdb/db
mkdir -p data/amavisd/db mkdir -p data/amavisd/db
...@@ -478,7 +472,15 @@ command = ...@@ -478,7 +472,15 @@ command =
mkdir -p data/clamav/db mkdir -p data/clamav/db
mkdir -p data/postfix/spool/pid mkdir -p data/postfix/spool/pid
mkdir -p data/tmp
chmod 1777 data/tmp
touch ${:ZIMBRA_HOME}/postfix/conf/main.cf
mkdir backup ssl .ssh zmstat
sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/openldap/sbin/slapd sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/openldap/sbin/slapd
sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/postfix/libexec/master sudo setcap 'cap_net_bind_service=+ep' ${:ZIMBRA_HOME}/postfix/libexec/master
# clear credential cache to spot commands in zmsetup.pl that would require sudo
sudo -k
ZIMBRA_INSTALLED_PKGS="${:PACKAGE_LIST}" ${:ZIMBRA_HOME}/libexec/zmsetup.pl
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment