This commit is contained in:
Bob Mottram 2016-01-05 08:46:31 +00:00
parent f946926c19
commit 8dc999c26c
1 changed files with 12 additions and 12 deletions

View File

@ -1635,7 +1635,7 @@ function randomize_cron {
sed -i "s|52 6\t|$randmin $randhr\t|g" /etc/crontab sed -i "s|52 6\t|$randmin $randhr\t|g" /etc/crontab
sed -i "s|\t1 \* \*|\t$randdom * *|g" /etc/crontab sed -i "s|\t1 \* \*|\t$randdom * *|g" /etc/crontab
service cron restart systemctl restart cron
echo 'randomize_cron' >> $COMPLETION_FILE echo 'randomize_cron' >> $COMPLETION_FILE
} }
@ -2020,7 +2020,7 @@ function mesh_cjdns {
echo ' AdvRouterAddr on;' >> /etc/radvd.conf echo ' AdvRouterAddr on;' >> /etc/radvd.conf
echo ' };' >> /etc/radvd.conf echo ' };' >> /etc/radvd.conf
echo '};' >> /etc/radvd.conf echo '};' >> /etc/radvd.conf
service radvd restart systemctl restart radvd
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
systemctl status radvd.service systemctl status radvd.service
exit 4395 exit 4395
@ -3183,7 +3183,7 @@ function create_freedns_updater {
if ! grep -q "/usr/bin/dynamicdns" /etc/crontab; then if ! grep -q "/usr/bin/dynamicdns" /etc/crontab; then
echo '*/3 * * * * root /usr/bin/dynamicdns' >> /etc/crontab echo '*/3 * * * * root /usr/bin/dynamicdns' >> /etc/crontab
service cron restart systemctl restart cron
fi fi
echo 'create_freedns_updater' >> $COMPLETION_FILE echo 'create_freedns_updater' >> $COMPLETION_FILE
@ -3777,7 +3777,7 @@ function regenerate_ssh_keys {
rm -f /etc/ssh/ssh_host_* rm -f /etc/ssh/ssh_host_*
dpkg-reconfigure openssh-server dpkg-reconfigure openssh-server
ssh_remove_small_moduli ssh_remove_small_moduli
service ssh restart systemctl restart ssh
echo 'regenerate_ssh_keys' >> $COMPLETION_FILE echo 'regenerate_ssh_keys' >> $COMPLETION_FILE
} }
@ -3836,7 +3836,7 @@ function time_synchronisation {
apt-get -y remove ntpdate apt-get -y remove ntpdate
echo '*/15 * * * * root /usr/bin/updatedate' >> /etc/crontab echo '*/15 * * * * root /usr/bin/updatedate' >> /etc/crontab
service cron restart systemctl restart cron
echo 'time_synchronisation' >> $COMPLETION_FILE echo 'time_synchronisation' >> $COMPLETION_FILE
} }
@ -4691,7 +4691,7 @@ function configure_imap {
rm /var/lib/dovecot/ssl-parameters.dat rm /var/lib/dovecot/ssl-parameters.dat
fi fi
service dovecot restart systemctl restart dovecot
echo 'configure_imap' >> $COMPLETION_FILE echo 'configure_imap' >> $COMPLETION_FILE
} }
@ -4773,7 +4773,7 @@ function configure_imap_client_certs {
touch /etc/ssl/ssldb touch /etc/ssl/ssldb
echo 0001 > /etc/ssl/sslserial echo 0001 > /etc/ssl/sslserial
#${PROJECT_NAME}-clientcert -u $MY_USERNAME #${PROJECT_NAME}-clientcert -u $MY_USERNAME
service dovecot restart systemctl restart dovecot
echo 'configure_imap_client_certs' >> $COMPLETION_FILE echo 'configure_imap_client_certs' >> $COMPLETION_FILE
} }
@ -5122,7 +5122,7 @@ function encrypt_outgoing_email {
# obtain your public key ID # obtain your public key ID
if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then
MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS") MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then if [ ! "$MY_GPG_PUBLIC_KEY_ID" ]; then
return return
fi fi
if [ ${#MY_GPG_PUBLIC_KEY_ID} -lt 4 ]; then if [ ${#MY_GPG_PUBLIC_KEY_ID} -lt 4 ]; then
@ -5496,7 +5496,7 @@ function create_public_mailing_list {
newaliases newaliases
update-exim4.conf.template -r update-exim4.conf.template -r
update-exim4.conf update-exim4.conf
service exim4 restart systemctl restart exim4
if ! grep -q $"$PUBLIC_MAILING_LIST mailing list" /home/$MY_USERNAME/README; then if ! grep -q $"$PUBLIC_MAILING_LIST mailing list" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
@ -5566,7 +5566,7 @@ function create_private_mailing_list {
chown -R schleuder:schleuder /var/lib/schleuder chown -R schleuder:schleuder /var/lib/schleuder
update-exim4.conf.template -r update-exim4.conf.template -r
update-exim4.conf update-exim4.conf
service exim4 restart systemctl restart exim4
useradd -d /var/schleuderlists -s /bin/false schleuder useradd -d /var/schleuderlists -s /bin/false schleuder
adduser Debian-exim schleuder adduser Debian-exim schleuder
usermod -a -G mail schleuder usermod -a -G mail schleuder
@ -5993,7 +5993,7 @@ function add_ddns_domain {
echo " alias $CURRENT_DDNS_DOMAIN" >> /etc/inadyn.conf echo " alias $CURRENT_DDNS_DOMAIN" >> /etc/inadyn.conf
fi fi
chmod 600 /etc/inadyn.conf chmod 600 /etc/inadyn.conf
service inadyn restart systemctl restart inadyn
systemctl daemon-reload systemctl daemon-reload
# clear the arguments # clear the arguments
@ -9677,7 +9677,7 @@ function install_sip {
groupadd sipwitch groupadd sipwitch
usermod -aG sipwitch $MY_USERNAME usermod -aG sipwitch $MY_USERNAME
service sipwitch start systemctl restart sipwitch
if ! grep -q $"SIP Server" /home/$MY_USERNAME/README; then if ! grep -q $"SIP Server" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README