Merge branch 'v1'
This commit is contained in:
		
						commit
						0024d51289
					
				| @ -48,6 +48,15 @@ npm install -g git+ssh://git@git.daplie.com:Daplie/goldilocks.js#v1 | |||||||
| npm install -g goldilocks@v1 | npm install -g goldilocks@v1 | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
|  | ### Uninstall | ||||||
|  | 
 | ||||||
|  | ``` | ||||||
|  | rm -rf /srv/goldilocks/ /var/goldilocks/ /etc/goldilocks/ /opt/goldilocks/ /var/log/goldilocks/ /etc/tmpfiles.d/goldilocks.service /etc/systemd/system/goldilocks.service | ||||||
|  | ``` | ||||||
|  | 
 | ||||||
|  | Usage | ||||||
|  | ----- | ||||||
|  | 
 | ||||||
| ```bash | ```bash | ||||||
| goldilocks | goldilocks | ||||||
| ``` | ``` | ||||||
|  | |||||||
							
								
								
									
										12
									
								
								dist/etc/tmpfiles.d/goldilocks.conf
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								dist/etc/tmpfiles.d/goldilocks.conf
									
									
									
									
										vendored
									
									
								
							| @ -2,9 +2,9 @@ | |||||||
| # See https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html | # See https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html | ||||||
| 
 | 
 | ||||||
| # Type Path           Mode UID      GID      Age Argument | # Type Path           Mode UID      GID      Age Argument | ||||||
| #d /etc/goldilocks          0755 www-data www-data -   - | #d /etc/goldilocks          0755 MY_USER MY_GROUP -   - | ||||||
| #d /opt/goldilocks          0775 www-data www-data -   - | #d /opt/goldilocks          0775 MY_USER MY_GROUP -   - | ||||||
| #d /srv/www                 0775 www-data www-data -   - | #d /srv/www                 0775 MY_USER MY_GROUP -   - | ||||||
| #d /etc/ssl/goldilocks      0750 www-data www-data -   - | #d /etc/ssl/goldilocks      0750 MY_USER MY_GROUP -   - | ||||||
| #d /var/log/goldilocks      0750 www-data www-data -   - | #d /var/log/goldilocks      0750 MY_USER MY_GROUP -   - | ||||||
| #d /run/goldilocks          0755 www-data www-data -   - | d /run/goldilocks          0755 MY_USER MY_GROUP -   - | ||||||
|  | |||||||
| @ -11,6 +11,10 @@ sed "s/MY_USER/$my_user/g" "$my_app_dist/$my_app_systemd_service" > "$my_app_dis | |||||||
| sed "s/MY_GROUP/$my_group/g" "$my_app_dist/$my_app_systemd_service.2" > "$my_app_dist/$my_app_systemd_service" | sed "s/MY_GROUP/$my_group/g" "$my_app_dist/$my_app_systemd_service.2" > "$my_app_dist/$my_app_systemd_service" | ||||||
| rm "$my_app_dist/$my_app_systemd_service.2" | rm "$my_app_dist/$my_app_systemd_service.2" | ||||||
| safe_copy_config "$my_app_dist/$my_app_systemd_service" "$my_root/$my_app_systemd_service" | safe_copy_config "$my_app_dist/$my_app_systemd_service" "$my_root/$my_app_systemd_service" | ||||||
|  | 
 | ||||||
|  | sed "s/MY_USER/$my_user/g" "$my_app_dist/$my_app_systemd_tmpfiles" > "$my_app_dist/$my_app_systemd_tmpfiles.2" | ||||||
|  | sed "s/MY_GROUP/$my_group/g" "$my_app_dist/$my_app_systemd_tmpfiles.2" > "$my_app_dist/$my_app_systemd_tmpfiles" | ||||||
|  | rm "$my_app_dist/$my_app_systemd_tmpfiles.2" | ||||||
| safe_copy_config "$my_app_dist/$my_app_systemd_tmpfiles" "$my_root/$my_app_systemd_tmpfiles" | safe_copy_config "$my_app_dist/$my_app_systemd_tmpfiles" "$my_root/$my_app_systemd_tmpfiles" | ||||||
| 
 | 
 | ||||||
| $sudo_cmd systemctl stop "${my_app_name}.service" >/dev/null 2>/dev/null || true | $sudo_cmd systemctl stop "${my_app_name}.service" >/dev/null 2>/dev/null || true | ||||||
|  | |||||||
| @ -122,8 +122,11 @@ echo "User $my_user Group $my_group" | |||||||
| $sudo_cmd chown -R $my_user:$my_group $my_tmp/* | $sudo_cmd chown -R $my_user:$my_group $my_tmp/* | ||||||
| $sudo_cmd chown root:root $my_tmp/* | $sudo_cmd chown root:root $my_tmp/* | ||||||
| $sudo_cmd chown root:root $my_tmp | $sudo_cmd chown root:root $my_tmp | ||||||
|  | # don't even read $my_tmp/ | ||||||
| # don't change permissions on /, /etc, etc | # don't change permissions on /, /etc, etc | ||||||
| rsync -a --ignore-existing $my_tmp/ $my_root/ | for my_dir in $my_tmp/*; do | ||||||
|  |   rsync -a --ignore-existing $my_tmp/$my_dir/ $my_root/$my_dir/ | ||||||
|  | done | ||||||
| rsync -a --ignore-existing $my_app_dist/etc/$my_name/$my_name.yml $my_root/etc/$my_name/$my_name.yml | rsync -a --ignore-existing $my_app_dist/etc/$my_name/$my_name.yml $my_root/etc/$my_name/$my_name.yml | ||||||
| source ./installer/install-system-service.sh | source ./installer/install-system-service.sh | ||||||
| 
 | 
 | ||||||
| @ -146,4 +149,4 @@ echo "Restart: systemctl restart $my_name" | |||||||
| echo "Logs: journalctl -xefu $my_name" | echo "Logs: journalctl -xefu $my_name" | ||||||
| echo "Config: /etc/$my_name/$my_name.yml" | echo "Config: /etc/$my_name/$my_name.yml" | ||||||
| echo "" | echo "" | ||||||
| echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/systemd/system/$my_name.service" | echo "Unistall: rm -rf /srv/$my_name/ /var/$my_name/ /etc/$my_name/ /opt/$my_name/ /var/log/$my_name/ /etc/tmpfiles.d/$my_name.service /etc/systemd/system/$my_name.service" | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user