Remove resume submodule, minor other updates
This commit is contained in:
parent
6f10d4df88
commit
117c0c2de9
|
@ -1,6 +1,3 @@
|
|||
[submodule "static"]
|
||||
path = static
|
||||
url = https://github.com/cactorium/cactorium.github.io
|
||||
[submodule "resume"]
|
||||
path = resume
|
||||
url = https://github.com/cactorium/kelvin-ly-resume.git
|
||||
|
|
15
install.sh
15
install.sh
|
@ -1,8 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo add-apt-repository ppa:gophers/archive
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install golang-1.10-go
|
||||
sudo apt-get -y install golang
|
||||
sudo apt-get -y install iptables-persistent
|
||||
|
||||
mkdir -p ~/go
|
||||
|
@ -13,12 +12,14 @@ echo "export GOPATH=~/go" >> ~/.bashrc
|
|||
sudo cp rules.v4 /etc/iptables/rules.v4
|
||||
sudo service netfilter-persistent reload
|
||||
|
||||
sudo cp kelvinly-server.service /etc/systemd/system
|
||||
sudo cp main-server.service /etc/systemd/system
|
||||
sudo cp gogs.service /etc/systemd/system
|
||||
|
||||
source ~/.bashrc
|
||||
go get -u gopkg.in/russross/blackfriday.v2
|
||||
#go get -u gopkg.in/russross/blackfriday.v2
|
||||
go get -u github.com/shurcooL/github_flavored_markdown
|
||||
go get -u github.com/sevlyar/go-daemon
|
||||
#go get -u github.com/sevlyar/go-daemon
|
||||
|
||||
sudo apt-get install certbot -t stretch-backports
|
||||
mkdir -p certbot-tmp
|
||||
sudo apt-get install certbot python3-certbot-dns-google
|
||||
|
||||
echo "cerbot still needs setup, and the servers need to be enabled!"
|
||||
|
|
|
@ -13,8 +13,8 @@ After=network.target
|
|||
Type=simple
|
||||
User=kelvin
|
||||
Group=kelvin
|
||||
WorkingDirectory=/home/kelvin/main-server
|
||||
ExecStart=/home/kelvin/main-server/main-server
|
||||
WorkingDirectory=/home/kelvin/go/src/main-server
|
||||
ExecStart=/home/kelvin/go/bin/main-server
|
||||
Restart=always
|
||||
Environment=USER=kelvin HOME=/home/kelvin
|
||||
|
||||
|
|
4
main.go
4
main.go
|
@ -244,8 +244,8 @@ func startServer(srv *http.Server) {
|
|||
srv.Handler = Gzip(serveMux)
|
||||
log.Print("starting server at " + srv.Addr)
|
||||
if !DEBUG {
|
||||
log.Fatal(srv.ListenAndServeTLS("/etc/letsencrypt/live/"+DOMAIN_NAME+"-0001/fullchain.pem",
|
||||
"/etc/letsencrypt/live/"+DOMAIN_NAME+"-0001/privkey.pem"))
|
||||
log.Fatal(srv.ListenAndServeTLS("/etc/letsencrypt/live/"+DOMAIN_NAME+"/fullchain.pem",
|
||||
"/etc/letsencrypt/live/"+DOMAIN_NAME+"/privkey.pem"))
|
||||
} else {
|
||||
log.Fatal(srv.ListenAndServe())
|
||||
}
|
||||
|
|
1
resume
1
resume
|
@ -1 +0,0 @@
|
|||
Subproject commit 4aa777f1da2f825f45837ee569cd2e919fd6b9fd
|
Loading…
Reference in New Issue