Commit eaf67b2d authored by Rafael Monnerat's avatar Rafael Monnerat

[slapos quick installer] Minor improvements on shell script

 - use sh -e instead set -e
 - use title instead email when configure re6stnet
parent d4fb1a99
#!/bin/bash #!/bin/sh -e
# This Script automates the the setup of SLAPOS Servers with # This Script automates the the setup of SLAPOS Servers with
# Essential information. # Essential information.
set -e
if [ -z "$EMAIL" ]; then
echo " [ERROR] Please export EMAIL= variable, and rerun the script, it is mandatory for re6stnet"
exit 1
fi
if [ -z "$COMPUTERNAME" ]; then if [ -z "$COMPUTERNAME" ]; then
echo " [ERROR] Please export COMPUTERNAME= variable, and rerun the script, it is mandatory for slapos" echo " [ERROR] Please export COMPUTERNAME= variable, and rerun the script, it is mandatory for slapos"
...@@ -39,7 +33,7 @@ sed -i "/tapVPN/d" /etc/cron.d/slapos-node ...@@ -39,7 +33,7 @@ sed -i "/tapVPN/d" /etc/cron.d/slapos-node
if [ ! -f /etc/re6stnet/re6stnet.conf ]; then if [ ! -f /etc/re6stnet/re6stnet.conf ]; then
# Register re6stnet. # Register re6stnet.
re6st-conf --registry http://re6stnet.nexedi.com/ -r emailAddress $EMAIL -d /etc/re6stnet --anonymous re6st-conf --registry http://re6stnet.nexedi.com/ -r title $COMPUTERNAME -d /etc/re6stnet --anonymous
echo "table 0" >> /etc/re6stnet/re6stnet.conf echo "table 0" >> /etc/re6stnet/re6stnet.conf
echo "interface eth0" >> /etc/re6stnet/re6stnet.conf echo "interface eth0" >> /etc/re6stnet/re6stnet.conf
...@@ -56,12 +50,6 @@ fi ...@@ -56,12 +50,6 @@ fi
set +e set +e
IPV6WAITTIME=5 IPV6WAITTIME=5
ping -c 2 re6stnet.nexedi.com
while [ $? != 0 ]; do
sleep 5
ping -c 2 re6stnet.nexedi.com
done
# Wait for native ipv6 connection to be ready # Wait for native ipv6 connection to be ready
i=0 i=0
ping6 -c 2 ipv6.google.com ping6 -c 2 ipv6.google.com
...@@ -84,9 +72,7 @@ if [ ! -f /etc/opt/slapos/slapos.cfg ]; then ...@@ -84,9 +72,7 @@ if [ ! -f /etc/opt/slapos/slapos.cfg ]; then
fi fi
cat > /usr/local/sbin/slapos-tweak << EOF cat > /usr/local/sbin/slapos-tweak << EOF
#!/bin/bash #!/bin/sh -e
set -e
mkdir -v -p -m 0755 `grep ^certificate_repository_path /etc/opt/slapos/slapos.cfg | sed 's/^certificate_repository_path.*= *//'` mkdir -v -p -m 0755 `grep ^certificate_repository_path /etc/opt/slapos/slapos.cfg | sed 's/^certificate_repository_path.*= *//'`
......
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