Re-added tmp/pids folder and added .gitignore exclusion because of za…

…mmad services not running correctly.
musqueteers · Dec 7, 2016 · 8f983df · 8f983df
1 parent b2b68fd
commit 8f983df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -15,11 +15,17 @@
 
 # Ignore all logfiles and tempfiles.
 /log
-/tmp
+/tmp/*
+/tmp/pids/*
 /public/assets/*.*
 /public/assets/app
 /public/assets/custom
 
+# except /tmp/pids/ which is needed for certain Zammad processes
+!/tmp
+!/tmp/pids
+!/tmp/pids/.keep
+
 # Ignore custom gem file
 /Gemfile.local
 

diff --git a/tmp/pids/.keep b/tmp/pids/.keep