Merge pull request #57 from yalh76/master
Reorder Service and Service in admin panel
This commit is contained in:
		
						commit
						c3e848ad0a
					
				@ -23,13 +23,6 @@ final_path=$(ynh_app_setting_get $app final_path)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
# STANDARD REMOVE
 | 
					# STANDARD REMOVE
 | 
				
			||||||
#=================================================
 | 
					 | 
				
			||||||
# STOP AND REMOVE SERVICE
 | 
					 | 
				
			||||||
#=================================================
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Remove the dedicated systemd config
 | 
					 | 
				
			||||||
ynh_remove_systemd_config
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
# REMOVE SERVICE FROM ADMIN PANEL
 | 
					# REMOVE SERVICE FROM ADMIN PANEL
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
@ -41,6 +34,13 @@ then
 | 
				
			|||||||
	yunohost service remove $app
 | 
						yunohost service remove $app
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#=================================================
 | 
				
			||||||
 | 
					# STOP AND REMOVE SERVICE
 | 
				
			||||||
 | 
					#=================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Remove the dedicated systemd config
 | 
				
			||||||
 | 
					ynh_remove_systemd_config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
# REMOVE DEPENDENCIES
 | 
					# REMOVE DEPENDENCIES
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
 | 
				
			|||||||
@ -91,12 +91,6 @@ ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
 | 
				
			|||||||
# Define and install dependencies
 | 
					# Define and install dependencies
 | 
				
			||||||
ynh_install_app_dependencies deb1 deb2
 | 
					ynh_install_app_dependencies deb1 deb2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#=================================================
 | 
					 | 
				
			||||||
# ADVERTISE SERVICE IN ADMIN PANEL
 | 
					 | 
				
			||||||
#=================================================
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
yunohost service add $app --log "/var/log/$app/APP.log"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
# RESTORE SYSTEMD
 | 
					# RESTORE SYSTEMD
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
@ -104,6 +98,12 @@ yunohost service add $app --log "/var/log/$app/APP.log"
 | 
				
			|||||||
ynh_restore_file "/etc/systemd/system/$app.service"
 | 
					ynh_restore_file "/etc/systemd/system/$app.service"
 | 
				
			||||||
systemctl enable $app.service
 | 
					systemctl enable $app.service
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#=================================================
 | 
				
			||||||
 | 
					# ADVERTISE SERVICE IN ADMIN PANEL
 | 
				
			||||||
 | 
					#=================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					yunohost service add $app --log "/var/log/$app/APP.log"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
# RESTORE THE CRON FILE
 | 
					# RESTORE THE CRON FILE
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user