Commit 4bbf1385 authored by Vivien Alger's avatar Vivien Alger

Finally pinpointed the true problem, missed a fi

parent 14eed090
...@@ -43,8 +43,16 @@ function spec_generation ...@@ -43,8 +43,16 @@ function spec_generation
sed $VERSION_REGEX $RPM_DIRECTORY/slapos.spec.base.in > $SLAPOS_SPEC sed $VERSION_REGEX $RPM_DIRECTORY/slapos.spec.base.in > $SLAPOS_SPEC
# Scriplet insertion # Scriplet insertion
# cat $RE6STNET_SCRIPT >> $SLAPOS_SPEC echo "%post" >> $SLAPOS_SPEC
# cat $RPM_DIRECTORY/slapos.spec.end.in >> $SLAPOS_SPEC cat $RE6STNET_SCRIPT >> $SLAPOS_SPEC
cat $RPM_DIRECTORY/post.sh >> $SLAPOS_SPEC
echo "%preun" >> $SLAPOS_SPEC
cat $RPM_DIRECTORY/preun.sh >> $SLAPOS_SPEC
echo "%postun" >> $SLAPOS_SPEC
cat $RPM_DIRECTORY/postun.sh >> $SLAPOS_SPEC
} }
function prepare_deb_packaging function prepare_deb_packaging
...@@ -110,22 +118,22 @@ if [ ! -d "$CURRENT_DIRECTORY/$SLAPOS_DIRECTORY" ]; then ...@@ -110,22 +118,22 @@ if [ ! -d "$CURRENT_DIRECTORY/$SLAPOS_DIRECTORY" ]; then
fi fi
# Prepare Makefile and offline script # Prepare Makefile and offline script
prepare_template_files #prepare_template_files
# Prepare Download Cache for SlapOS # Prepare Download Cache for SlapOS
prepare_download_cache #prepare_download_cache
# Prepare tarball # Prepare tarball
prepare_tarball #prepare_tarball
# Generate spec file # Generate spec file
spec_generation spec_generation
# Prepare deb packaging # Prepare deb packaging
prepare_deb_packaging #prepare_deb_packaging
# Upload to obs # Upload to obs
obs_upload #obs_upload
# Save current version # Save current version
echo "$RECIPE_VERSION" > $CURRENT_DIRECTORY/slapos-recipe-version echo "$RECIPE_VERSION" > $CURRENT_DIRECTORY/slapos-recipe-version
......
SLAPOS_CFG_PATH=/etc/opt/slapos/slapos.cfg SLAPOS_CFG_PATH=/etc/opt/slapos/slapos.cfg
function re6st_conf_generation() re6st_conf_generation()
{ {
# Generate re6st configuration # Generate re6st configuration
read -p "Please enter the registry you wish to use for re6st[http://re6stnet.nexedi.com]: " REGISTRY read -p "Please enter the registry you wish to use for re6st[http://re6stnet.nexedi.com]: " REGISTRY
...@@ -12,7 +12,7 @@ function re6st_conf_generation() ...@@ -12,7 +12,7 @@ function re6st_conf_generation()
effect" effect"
} }
function remove_VPN_conf() remove_VPN_conf()
{ {
# Remove VPN configuration # Remove VPN configuration
if [ -e /etc/openvpn/vifib.conf ]; then if [ -e /etc/openvpn/vifib.conf ]; then
...@@ -27,7 +27,7 @@ function remove_VPN_conf() ...@@ -27,7 +27,7 @@ function remove_VPN_conf()
fi fi
} }
function modify_interfaces_in_SlapOS_conf() modify_interfaces_in_SlapOS_conf()
{ {
# Modify slapos.cfg to use lo # Modify slapos.cfg to use lo
cp $SLAPOS_CFG_PATH $SLAPOS_CFG_PATH.old cp $SLAPOS_CFG_PATH $SLAPOS_CFG_PATH.old
...@@ -59,5 +59,6 @@ if [ -e $SLAPOS_CFG_PATH ]; then ...@@ -59,5 +59,6 @@ if [ -e $SLAPOS_CFG_PATH ]; then
# Manual configuration by user before upgrade # Manual configuration by user before upgrade
echo "You seem to have no separate interface for ipv6, please proceed \ echo "You seem to have no separate interface for ipv6, please proceed \
with the configuration of re6st and SlapOS Node by yourself." with the configuration of re6st and SlapOS Node by yourself."
fi
fi fi
fi fi
...@@ -93,81 +93,3 @@ mkdir -p $RPM_BUILD_ROOT/opt/slapos/log ...@@ -93,81 +93,3 @@ mkdir -p $RPM_BUILD_ROOT/opt/slapos/log
%files %files
/ /
%defattr(-,root,root) %defattr(-,root,root)
%post
SLAPOS_CFG_PATH=/etc/opt/slapos/slapos.cfg
function re6st_conf_generation()
{
# Generate re6st configuration
read -p "Please enter the registry you wish to use for re6st[http://re6stnet.nexedi.com]: " REGISTRY
REGISTRY=${REGISTRY:-http://re6stnet.nexedi.com}
read -p "Please enter your email for token generation: " EMAIL
re6st-conf --registry $REGISTRY --email $EMAIL -r emailAddress $EMAIL -d /etc/re6stnet
echo "File /etc/re6stnet/re6stnet.conf generated"
echo "You now need to reboot your server manually for the changes to take\
effect"
}
function remove_VPN_conf()
{
# Remove VPN configuration
if [ -e /etc/openvpn/vifib.conf ]; then
rm /etc/openvpn/vifib.conf
rm -Rf /etc/openvpn/vifib-keys
echo "Removed vifib OpenVPN configuration files"
fi
if [ -e /etc/opt/slapos/openvpn-needed ]; then
rm /etc/opt/slapos/openvpn-needed
echo "Removed /etc/opt/slapos/openvpn-needed"
fi
}
function modify_interfaces_in_SlapOS_conf()
{
# Modify slapos.cfg to use lo
cp $SLAPOS_CFG_PATH $SLAPOS_CFG_PATH.old
echo "Copied old slapos.cfg to $SLAPOS_CFG_PATH.old"
sed 's/\(interface_name =\).*/\1 lo/g' $SLAPOS_CFG_PATH.old > $SLAPOS_CFG_PATH.tmp
sed 's/.*ipv6_interface =.*//g' $SLAPOS_CFG_PATH.tmp > $SLAPOS_CFG_PATH
rm $SLAPOS_CFG_PATH.tmp
}
#XXX Vivien: fugly logic, feel free to modify it if you can do better
# or if install/upgrade procedure was simplified
if [ -e $SLAPOS_CFG_PATH ]; then
# In case of an upgrade test for native ipv6 inside slapos.cfg
if grep -qe "ipv6_interface" $SLAPOS_CFG_PATH && ! grep -qe "#ipv6_interface" $SLAPOS_CFG_PATH; then
# If using vifib VPN
remove_VPN_conf
modify_interfaces_in_SlapOS_conf
re6st_conf_generation
elif [ ! -e /etc/re6stnet/re6stnet.conf ]; then
if grep -qe "interface_name = lo" $SLAPOS_CFG_PATH; then
# New node with new configuration case
re6st_conf_generation
else
# Manual configuration by user before upgrade
echo "You seem to have no separate interface for ipv6, please proceed \
with the configuration of re6st and SlapOS Node by yourself."
fi
fi
echo """To generate slapos configuration run '#slapos node register'"""
if [ -f /bin/systemctl ]; then
systemctl enable slapos-node.service
systemctl start slapos-node.service
fi
%preun
if [ -f /bin/systemctl ]; then
systemctl stop slapos-node.service
fi
%postun
if [ -f /bin/systemctl ]; then
systemctl restart slapos-node.service
fi
echo """To generate slapos configuration run '#slapos node register'"""
if [ -f /bin/systemctl ]; then
systemctl enable slapos-node.service
systemctl start slapos-node.service
fi
%preun
if [ -f /bin/systemctl ]; then
systemctl stop slapos-node.service
fi
%postun
if [ -f /bin/systemctl ]; then
systemctl restart slapos-node.service
fi
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