浏览代码

Fix invocation

George Baugh 2 年之前
父节点
当前提交
f518ab22ab
共有 1 个文件被更改,包括 5 次插入7 次删除
  1. 5 7
      Makefile

+ 5 - 7
Makefile

@@ -81,14 +81,12 @@ nginx:
 	sed 's/\%SERVER_NAME\%/$(SERVER_NAME)/g' nginx/tcms.conf.tmpl > nginx/tcms.conf.intermediate
 	sed 's/\%SERVER_PORT\%/$(SERVER_PORT)/g' nginx/tcms.conf.intermediate > nginx/tcms.conf
 	rm nginx/tcms.conf.intermediate
-	mkdir -p '/var/www/$(SERVER_NAME)'
-	mkdir -p '/var/www/mail.$(SERVER_NAME)'
-	mkdir -p '/etc/letsencrypt/live/$(SERVER_NAME)'
-	ln -sr nginx/tcms.conf '/etc/nginx/sites-enabled/$(SERVER_NAME).conf'
+	sudo mkdir -p '/var/www/$(SERVER_NAME)'
+	sudo mkdir -p '/var/www/mail.$(SERVER_NAME)'
+	sudo mkdir -p '/etc/letsencrypt/live/$(SERVER_NAME)'
+	sudo ln -sr nginx/tcms.conf '/etc/nginx/sites-enabled/$(SERVER_NAME).conf'
 	# Make a self-signed cert FIRST, because certbot has a chicken/egg problem
-	openssl req -x509 -nodes -newkey -subj '/CN=$(SERVER_NAME)' -addext 'subjectAltName=DNS:www.$(SERVER_NAME),DNS:mail.$(SERVER_NAME)' rsa:4096 -keyout '/etc/letsencrypt/live/$(SERVER_NAME)/privkey.pem' -out '/etc/letsencrypt/live/$(SERVER_NAME)/fullchain.pem' -days 365
+	openssl req -x509 -nodes -newkey rsa:4096 -subj '/CN=$(SERVER_NAME)' -addext 'subjectAltName=DNS:www.$(SERVER_NAME),DNS:mail.$(SERVER_NAME)' -keyout '/etc/letsencrypt/live/$(SERVER_NAME)/privkey.pem' -out '/etc/letsencrypt/live/$(SERVER_NAME)/fullchain.pem' -days 365
 	# Now run certbot and get that http dcv
 	certbot certonly --webroot -w '/var/www/$(SERVER_NAME)/' -d '$(SERVER_NAME)' -d 'www.$(SERVER_NAME)' -w '/var/www/mail.$(SERVER_NAME)' -d 'mail.$(SERVER_NAME)'
 	systemctl restart nginx
-	systemctl restart dovecot
-	systemctl restart postfix