7 år sedan · f03e42fb11
--- a/extra/apache/sitegen.conf
+++ b/extra/apache/sitegen.conf
--- a/bash/sitegen.completion
+++ b/bash/sitegen.completion
--- a/extra/cron/sitegen-cert-renew
+++ b/extra/cron/sitegen-cert-renew
--- a/extra/sitegen/hooks-available/cert/000-print
+++ b/extra/sitegen/hooks-available/cert/000-print
--- a/extra/sitegen/hooks-available/cert/100-mkwebroot
+++ b/extra/sitegen/hooks-available/cert/100-mkwebroot
--- a/extra/sitegen/hooks-available/cert/200-reload
+++ b/extra/sitegen/hooks-available/cert/200-reload
--- a/extra/sitegen/hooks-available/site/000-print
+++ b/extra/sitegen/hooks-available/site/000-print
--- a/extra/sitegen/hooks-available/site/100-sitegen-cert-request
+++ b/extra/sitegen/hooks-available/site/100-sitegen-cert-request
--- a/extra/sitegen/hooks-available/site/200-chown
+++ b/extra/sitegen/hooks-available/site/200-chown
--- a/extra/sitegen/hooks-available/site/300-a2ensite
+++ b/extra/sitegen/hooks-available/site/300-a2ensite
--- a/extra/sitegen/hooks-available/site/400-reload
+++ b/extra/sitegen/hooks-available/site/400-reload
--- a/extra/sitegen/sitegen.json
+++ b/extra/sitegen/sitegen.json
--- a/extra/sitegen/templates/default.include
+++ b/extra/sitegen/templates/default.include
--- a/extra/sitegen/templates/docker.include
+++ b/extra/sitegen/templates/docker.include
--- a/extra/sitegen/templates/http.conf
+++ b/extra/sitegen/templates/http.conf
--- a/extra/sitegen/templates/https.conf
+++ b/extra/sitegen/templates/https.conf
--- a/extra/sitegen/templates/laravel.include
+++ b/extra/sitegen/templates/laravel.include
--- a/extra/sitegen/templates/reverse.include
+++ b/extra/sitegen/templates/reverse.include
--- a/extra/sitegen/templates/rhttp.conf
+++ b/extra/sitegen/templates/rhttp.conf
--- a/extra/sitegen/templates/rhttps.conf
+++ b/extra/sitegen/templates/rhttps.conf
--- a/extra/sitegen/templates/sreverse.include
+++ b/extra/sitegen/templates/sreverse.include
--- a/sitegen/sitegen.py
+++ b/sitegen/sitegen.py
--- a/tests/sitegen.json
+++ b/tests/sitegen.json
@@ -1,7 +1,7 @@
 
				
				 {
			
 
				
				   "siteConfDir": "./tests/etc/apache2/sites-available/",
			
 
				
				   "siteDir": "./tests/var/",
			
 
				
				-  "confDir": "./sitegen/",
			
 
				
				+  "confDir": "./extra/sitegen/",
			
 
				
				   "certRenewTime": 5356800,
			
 
				
				   "letsencryptCommands": [
			
 
				
				     {