Configure for <https://status.ladys.computer>

diff --git a/Makefile b/Makefile
index 6e6d778512cec4eb6e9d447c1b6f03d5c395b267..aeb91ace9b1fdc97ed854ede6a630c815e247e99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,7 @@
-USERNAME := USERNAME
-DOMAIN := DOMAIN
-GIT_REPOSITORY := /home/$(USERNAME)/Status.git
-

 nothing:
        @echo 'Type `make remote` to update the remote post-receive script.'
 
 remote:
 nothing:
        @echo 'Type `make remote` to update the remote post-receive script.'
 
 remote:

-       scp post-receive $(USERNAME)@$(DOMAIN):$(GIT_REPOSITORY)/hooks/post-receive
+       scp post-receive computer:/srv/git/Status/hooks/post-receive

 
 .PHONY: nothing remote ;
 
 .PHONY: nothing remote ;

diff --git a/post-receive b/post-receive
index b07ad47ddfd28b92fae4bd8b7f0caaa58323404b..286b34e8bc001837eaa85aea8e2f475b2667d21c 100755 (executable)
--- a/post-receive
+++ b/post-receive
@@ -4,7 +4,7 @@ from glob import iglob
 from itertools import starmap
 import json
 from os import mkdir
 from itertools import starmap
 import json
 from os import mkdir

-from os.path import exists
+from os.path import exists, expanduser

 from pathlib import Path
 import re
 from shutil import copy2, rmtree
 from pathlib import Path
 import re
 from shutil import copy2, rmtree


@@ -14,10 +14,10 @@ from warnings import warn
 from xml.dom import XHTML_NAMESPACE
 from xml.dom.minidom import getDOMImplementation, parseString
 
 from xml.dom import XHTML_NAMESPACE
 from xml.dom.minidom import getDOMImplementation, parseString
 

-GIT_DIRECTORY = "/home/USERNAME/Status.git"
-BUILD_DIRECTORY = "/home/USERNAME/status.site.example/.build"
-PUBLIC_DIRECTORY = "/home/USERNAME/status.site.example/public"
-PUBLIC_URL = "https://status.site.example"
+GIT_DIRECTORY = "/srv/git/Status"
+BUILD_DIRECTORY = expanduser("~/lady/status/.build")
+PUBLIC_DIRECTORY = expanduser("~/lady/status/public")
+PUBLIC_URL = "https://status.ladys.computer"

 LANG = "en"
 LIVE_BRANCH = "live"
 
 LANG = "en"
 LIVE_BRANCH = "live"