From 117c0c2de91990ac83173b8f4a9cd6e5caad94be Mon Sep 17 00:00:00 2001
From: "Kelvin Ly (on the cloud)" <kelvin.ly1618+cloud@gmail.com>
Date: Sat, 20 Jun 2020 12:33:22 +0000
Subject: [PATCH] Remove resume submodule, minor other updates

---
 .gitmodules         |  3 ---
 install.sh          | 15 ++++++++-------
 main-server.service |  4 ++--
 main.go             |  4 ++--
 resume              |  1 -
 5 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 160000 resume

diff --git a/.gitmodules b/.gitmodules
index b960ade..fef61cf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/install.sh b/install.sh
index e8dd089..62cb3a9 100755
--- a/install.sh
+++ b/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!"
diff --git a/main-server.service b/main-server.service
index 4632885..1e42f63 100644
--- a/main-server.service
+++ b/main-server.service
@@ -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
 
diff --git a/main.go b/main.go
index 9e16a18..e93a7ad 100644
--- a/main.go
+++ b/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())
 	}
diff --git a/resume b/resume
deleted file mode 160000
index 4aa777f..0000000
--- a/resume
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4aa777f1da2f825f45837ee569cd2e919fd6b9fd