Merge
authorThierry Florac <thierry.florac@onf.fr>
Thu, 22 Mar 2018 14:25:35 +0100
changeset 37 be9bbb172175
parent 34 2c40138c1c1f (current diff)
parent 36 f5cb57e5bd7c (diff)
child 38 4b245c59486f
Merge
--- a/cookiecutter.json	Tue Mar 13 08:55:43 2018 +0100
+++ b/cookiecutter.json	Thu Mar 22 14:25:35 2018 +0100
@@ -6,7 +6,7 @@
   "webapp_name": "webapp",
   "webapp_port": 6543,
   "eggs_directory": "eggs",
-  "logs_directory": "/var/log/apache2",
+  "logs_directory": "$((INSTALL))/var/log",
   "run_user": "www-data",
   "run_group": "www-data",
   "beaker_backend": ["redis", "memcached"],
--- a/hooks/post_gen_project.py	Tue Mar 13 08:55:43 2018 +0100
+++ b/hooks/post_gen_project.py	Thu Mar 22 14:25:35 2018 +0100
@@ -38,7 +38,7 @@
 group_id = getgrnam(group).gr_gid
 
 
-LOGS_DIRECTORY = '{{ cookiecutter.logs_directory }}'
+LOGS_DIRECTORY = '{{ cookiecutter.logs_directory }}'.replace('$((INSTALL))', TARGET)
 
 if not os.path.exists(LOGS_DIRECTORY):
     try:
@@ -46,7 +46,10 @@
     except PermissionError:
         print("WARNING: Can't create logs directory {0}".format(LOGS_DIRECTORY))
     else:
-        os.chown(LOGS_DIRECTORY, user_id, group_id)
+        try:
+            os.chown(LOGS_DIRECTORY, user_id, group_id)
+        except PermissionError:
+            print("WARNING: Can't update permission on logs directory {0}".format(LOGS_DIRECTORY))
 
 
 #