diff --git a/install_orbit_environment.sh b/install_orbit_environment.sh index ea652bf..e790fa0 100644 --- a/install_orbit_environment.sh +++ b/install_orbit_environment.sh @@ -130,11 +130,12 @@ if [ -z $(which rvm) ]; then sudo chown $USER:$USER /usr/share/rvm -R fi source "/etc/profile.d/rvm.sh" -# install ruby 2.1.10 -rvm install 2.1.10 -rvm --default use 2.1.10 +# install ruby 2.7.6 +rvm install 2.7.6 +rvm --default use 2.7.6 gem install zip -gem install nokogiri -v 1.7.0.1 +gem install nokogiri -v 1.8.5 #for ruby 2.7.6 +#gem install nokogiri -v 1.7.0.1 #for ruby 2.1.10 sudo apt-get install screen -y sudo sed -i 's/#cron\.\*/cron\.\*/g' /etc/rsyslog.d/50-default.conf sudo service rsyslog restart diff --git a/orbit_service.sh b/orbit_service.sh index c77fbba..56a19f8 100644 --- a/orbit_service.sh +++ b/orbit_service.sh @@ -28,7 +28,7 @@ else fi ORBIT_SITES=`pwd` -ORBIT_GIT='http://gitlab.tp.rulingcom.com/core/orbit-kernel.git' +ORBIT_GIT='http://ruling.digital/git' ORBIT_BUILT_IN_EXT='http://gitlab.tp.rulingcom.com/core/default-modules/-/raw/orbit/built_in_extensions.rb' ORBIT_DEFAULT_THEME='http://gitlab.tp.rulingcom.com/themes/default-theme.git' NGINX_ORBIT_SITES='/etc/nginx/orbit_sites' @@ -208,13 +208,13 @@ create) done cd ~ - sudo wget http://gitlab.tp.rulingcom.com/erictyl/install_r45_on_ubuntu_1804lts_doc/-/raw/master/http://installer.tp.rulingcom.com/nginx4-5.conf -O $NGINX_ORBIT_SITES/$site_name + sudo wget http://gitlab.tp.rulingcom.com/erictyl/install_r45_on_ubuntu_1804lts_doc/-/raw/master/nginx4-5.conf -O $NGINX_ORBIT_SITES/$site_name sudo perl -pi -e "s/{{ORBIT}}/$site_name/g" $NGINX_ORBIT_SITES/$site_name sudo perl -pi -e "s#{{ORBIT_SITES}}#${ORBIT_SITES}#g" $NGINX_ORBIT_SITES/$site_name sudo perl -pi -e "s/{{PORT}}/$PORT/g" $NGINX_ORBIT_SITES/$site_name sudo perl -pi -e "s/{{SERVER_NAME}}/$SERVER_NAME/g" $NGINX_ORBIT_SITES/$site_name sudo service nginx reload - + sudo su -l $ORBIT_USER -c "mkdir -p $ORBIT_SITES" sudo su -l $ORBIT_USER -c "cd $ORBIT_SITES && git clone $ORBIT_GIT $site_name" sudo su -l $ORBIT_USER -c "cd $ORBIT_SITES/$site_name && wget $ORBIT_BUILT_IN_EXT && git clone $ORBIT_DEFAULT_THEME app/templates/default-theme && bundle install" sudo su -l $ORBIT_USER -c "cd $ORBIT_SITES/$site_name && perl -pi -e \"s/orbit_4_5/$DATABASE/g\" config/mongoid.yml"