From d78c849d70b43759e5ba7d6faa21f3f5dda47344 Mon Sep 17 00:00:00 2001 From: Victor Vassilev Date: Fri, 4 May 2018 14:56:56 +0300 Subject: [PATCH 1/2] refactor(install): Exclude centreon config file from git Move centreon.config.php to centreon.config.php.example and exclude from git. Closes: CP7M18 BREAKING CHANGE: Requires RPM-build logic rework, do not merge before it is applied! --- .gitignore | 3 ++- config/{centreon.config.php => centreon.config.php.example} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename config/{centreon.config.php => centreon.config.php.example} (100%) diff --git a/.gitignore b/.gitignore index 1bcebb58e5d..d73a4f6c9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ www/install/tmp/* !www/img/media/.keep www/img/media/* !www/install/tmp/.gitkeep -www/install/install.conf.php \ No newline at end of file +www/install/install.conf.php +config/centreon.config.php diff --git a/config/centreon.config.php b/config/centreon.config.php.example similarity index 100% rename from config/centreon.config.php rename to config/centreon.config.php.example From 99cec1be4f6eb21acb37be75f54eb718349a918b Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 21 Jun 2018 11:06:42 +0200 Subject: [PATCH 2/2] chore(packaging): rename config file template --- .../{centreon.config.php.example => centreon.config.php.template} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/{centreon.config.php.example => centreon.config.php.template} (100%) diff --git a/config/centreon.config.php.example b/config/centreon.config.php.template similarity index 100% rename from config/centreon.config.php.example rename to config/centreon.config.php.template