fix update script
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -2,6 +2,7 @@
 | 
				
			|||||||
.quasar
 | 
					.quasar
 | 
				
			||||||
node_modules
 | 
					node_modules
 | 
				
			||||||
/dist
 | 
					/dist
 | 
				
			||||||
 | 
					web/dist
 | 
				
			||||||
.env.local
 | 
					.env.local
 | 
				
			||||||
.env.*.local
 | 
					.env.*.local
 | 
				
			||||||
npm-debug.log*
 | 
					npm-debug.log*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@ AUTH_USER_MODEL = "accounts.User"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# bump this version everytime vue code is changed
 | 
					# bump this version everytime vue code is changed
 | 
				
			||||||
# to alert user they need to manually refresh their browser
 | 
					# to alert user they need to manually refresh their browser
 | 
				
			||||||
APP_VER = "0.0.3"
 | 
					APP_VER = "0.0.4"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
INSTALLED_APPS = [
 | 
					INSTALLED_APPS = [
 | 
				
			||||||
    "django.contrib.admin",
 | 
					    "django.contrib.admin",
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										24
									
								
								update.sh
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								update.sh
									
									
									
									
									
								
							@@ -5,17 +5,17 @@ do
 | 
				
			|||||||
sudo systemctl stop ${i}
 | 
					sudo systemctl stop ${i}
 | 
				
			||||||
done
 | 
					done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd /home/${USER}/rmm/
 | 
					cd /rmm
 | 
				
			||||||
git fetch origin develop
 | 
					git fetch origin develop
 | 
				
			||||||
git reset --hard FETCH_HEAD
 | 
					git reset --hard FETCH_HEAD
 | 
				
			||||||
git clean -df
 | 
					git clean -df
 | 
				
			||||||
cp /home/${USER}/rmm/_modules/* /srv/salt/_modules/
 | 
					cp /rmm/_modules/* /srv/salt/_modules/
 | 
				
			||||||
cp /home/${USER}/rmm/scripts/* /srv/salt/scripts/
 | 
					cp /rmm/scripts/* /srv/salt/scripts/
 | 
				
			||||||
rm -rf /home/${USER}/rmm/api/env
 | 
					rm -rf /rmm/api/env
 | 
				
			||||||
cd /home/${USER}/rmm/api
 | 
					cd /rmm/api
 | 
				
			||||||
python3.7 -m venv env
 | 
					python3 -m venv env
 | 
				
			||||||
source /home/${USER}/rmm/api/env/bin/activate
 | 
					source /rmm/api/env/bin/activate
 | 
				
			||||||
cd /home/${USER}/rmm/api/tacticalrmm
 | 
					cd /rmm/api/tacticalrmm
 | 
				
			||||||
pip install --no-cache-dir --upgrade pip
 | 
					pip install --no-cache-dir --upgrade pip
 | 
				
			||||||
pip install --no-cache-dir --upgrade setuptools wheel
 | 
					pip install --no-cache-dir --upgrade setuptools wheel
 | 
				
			||||||
pip install --no-cache-dir -r requirements.txt
 | 
					pip install --no-cache-dir -r requirements.txt
 | 
				
			||||||
@@ -25,13 +25,13 @@ python manage.py delete_tokens
 | 
				
			|||||||
deactivate
 | 
					deactivate
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rm -rf /home/${USER}/rmm/web/node_modules
 | 
					rm -rf /rmm/web/node_modules
 | 
				
			||||||
rm -rf /home/${USER}/rmm/web/dist
 | 
					rm -rf /rmm/web/dist
 | 
				
			||||||
cd /home/${USER}/rmm/web
 | 
					cd /rmm/web
 | 
				
			||||||
npm install
 | 
					npm install
 | 
				
			||||||
npm run build
 | 
					npm run build
 | 
				
			||||||
sudo rm -rf /var/www/rmm/dist
 | 
					sudo rm -rf /var/www/rmm/dist
 | 
				
			||||||
sudo cp -pvr /home/${USER}/rmm/web/dist /var/www/rmm/
 | 
					sudo cp -pvr /rmm/web/dist /var/www/rmm/
 | 
				
			||||||
sudo chown www-data:www-data -R /var/www/rmm/dist
 | 
					sudo chown www-data:www-data -R /var/www/rmm/dist
 | 
				
			||||||
 | 
					
 | 
				
			||||||
for i in celery celery-winupdate celerybeat rmm nginx
 | 
					for i in celery celery-winupdate celerybeat rmm nginx
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user