fixes to service. add moar footer
This commit is contained in:
		
							parent
							
								
									747c03b2d4
								
							
						
					
					
						commit
						280ce28fea
					
				
							
								
								
									
										27
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								Makefile
									
									
									
									
									
								
							@ -1,36 +1,37 @@
 | 
				
			|||||||
NAME=sour.is-ipseity
 | 
					NAME=sour.is-keyproofs
 | 
				
			||||||
BUMP?=current
 | 
					BUMP?=current
 | 
				
			||||||
DATE:=$(shell date -u +%FT%TZ)
 | 
					DATE:=$(shell date -u +%FT%TZ)
 | 
				
			||||||
HASH:=$(shell git rev-pars HEAD 2> /dev/null)
 | 
					HASH:=$(shell git rev-pars HEAD 2> /dev/null)
 | 
				
			||||||
VERSION:=$(shell BUMP=$(BUMP) ./version.sh)
 | 
					VERSION:=$(shell BUMP=$(BUMP) ./version.sh)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					build: $(NAME)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					clean:
 | 
				
			||||||
 | 
						rm -f $(NAME)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
version:
 | 
					version:
 | 
				
			||||||
	@echo $(VERSION)
 | 
						@echo $(VERSION)
 | 
				
			||||||
 | 
					 | 
				
			||||||
tag:
 | 
					tag:
 | 
				
			||||||
	git tag -a v$(VERSION) -m "Version: $(VERSION)"
 | 
						git tag -a v$(VERSION) -m "Version: $(VERSION)"
 | 
				
			||||||
release:
 | 
					release:
 | 
				
			||||||
	@make tag BUMP=patch
 | 
						@make tag BUMP=patch
 | 
				
			||||||
 | 
					 | 
				
			||||||
run:
 | 
					run:
 | 
				
			||||||
	go run -v \
 | 
						go run -v \
 | 
				
			||||||
           -ldflags "\
 | 
					           -ldflags "\
 | 
				
			||||||
              -X main.AppVersion=$(VERSION) \
 | 
					              -X main.AppVersion=$(VERSION) \
 | 
				
			||||||
              -X main.BuildHash=$(HASH) \
 | 
					              -X main.BuildHash=$(HASH) \
 | 
				
			||||||
              -X main.BuildDate=$(DATE) \
 | 
					              -X main.BuildDate=$(DATE)" .
 | 
				
			||||||
			" \
 | 
					 | 
				
			||||||
	   .
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
build:
 | 
					$(NAME):
 | 
				
			||||||
	go build -v \
 | 
						go build -v \
 | 
				
			||||||
 | 
					           -o $(NAME) \
 | 
				
			||||||
           -ldflags "\
 | 
					           -ldflags "\
 | 
				
			||||||
              -X main.AppVersion=$(VERSION) \
 | 
					              -X main.AppVersion=$(VERSION) \
 | 
				
			||||||
              -X main.BuildHash=$(HASH) \
 | 
					              -X main.BuildHash=$(HASH) \
 | 
				
			||||||
              -X main.BuildDate=$(DATE) \
 | 
					              -X main.BuildDate=$(DATE)" .
 | 
				
			||||||
			" \
 | 
					 | 
				
			||||||
	   .
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
install: build
 | 
					install: $(NAME)
 | 
				
			||||||
	install ./keyproofs /usr/local/bin
 | 
						install ./$(NAME) /usr/local/bin
 | 
				
			||||||
	install ./sour.is-keyproofs.service /lib/systemd/system
 | 
						install ./$(NAME).service /lib/systemd/system
 | 
				
			||||||
 | 
						systemctl daemon-reload
 | 
				
			||||||
 | 
				
			|||||||
@ -173,7 +173,7 @@ var pageTPL = `
 | 
				
			|||||||
		</div>
 | 
							</div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<div class="card-footer text-muted text-center">
 | 
							<div class="card-footer text-muted text-center">
 | 
				
			||||||
			© 2020 Sour.is
 | 
								© 2020 Sour.is | <a href="/id/me@sour.is">About me</a> | <a href="https://github.com/sour-is/keyproofs">GitHub</a> | Inspired by <a href="https://keyoxide.org/">keyoxide</a>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@ After=syslog.target network.target
 | 
				
			|||||||
Type=simple
 | 
					Type=simple
 | 
				
			||||||
User=www-data
 | 
					User=www-data
 | 
				
			||||||
WorkingDirectory=/var/www
 | 
					WorkingDirectory=/var/www
 | 
				
			||||||
ExecStart=/usr/local/bin/keyproofs
 | 
					ExecStart=/usr/local/bin/sour.is-keyproofs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Restart=always
 | 
					Restart=always
 | 
				
			||||||
RestartSec=30
 | 
					RestartSec=30
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user