Merge pull request #1583 from wallabag/v2-fix-delete

[github/wallabag/wallabag.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0beb08c14e5efd7fe166be37c1b275d43bc42e39..b6d6aa5d568f2cce10d5d206ccf2d8778280756a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,37 @@
-/app/SymfonyRequirements.php
-/app/bootstrap.php.cache
-/app/check.php
-/app/cache/*
+# Cache, logs & sessions
+/var/*
+!/var/cache
+/var/cache/*
+!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
+
+# Parameters
 /app/config/parameters.yml
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-.idea
-.DS_Store
-.vagrant
+
+# Managed by Composer
 /vendor/
 
-/bin/
-!bin/install
-!bin/test
-!bin/symfony
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
 
-data/assets/*
-data/db/poche.sqlite
+# Build
+/app/build
+/build
 
-/web/.htaccess
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
+data/assets/*
+data/db/wallabag*.sqlite
 
-!.gitignore
\ No newline at end of file
+# Docker container logs and data
+docker/logs/
+docker/data/