From 3bbe6a50b7164d99256d260dc4bc2d4b91c0bdc9 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Wed, 30 Nov 2016 15:40:12 +0100
Subject: [PATCH] New installation procedure for roc demo example.

---
 examples/demo/.gitignore          |  2 ++
 examples/demo/install_modules.bat | 17 +----------------
 examples/demo/roc.cfg             | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 examples/demo/.gitignore
 create mode 100644 examples/demo/roc.cfg

diff --git a/examples/demo/.gitignore b/examples/demo/.gitignore
new file mode 100644
index 0000000..f55f045
--- /dev/null
+++ b/examples/demo/.gitignore
@@ -0,0 +1,2 @@
+site/db/*
+site/files/*
diff --git a/examples/demo/install_modules.bat b/examples/demo/install_modules.bat
index 591cac0..a92523d 100644
--- a/examples/demo/install_modules.bat
+++ b/examples/demo/install_modules.bat
@@ -3,19 +3,4 @@ setlocal
 set ROC_CMD=call %~dp0..\..\tools\roc.bat
 set ROC_CMS_DIR=%~dp0
 
-%ROC_CMD% install --module ..\..\modules\admin	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\auth	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\basic_auth	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\blog	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\contact	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\feed_aggregator	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\google_search	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\node	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\oauth20	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\openid	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\recent_changes	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\seo	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\session_auth	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\taxonomy	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\files	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\custom_block	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --config roc.cfg
diff --git a/examples/demo/roc.cfg b/examples/demo/roc.cfg
new file mode 100644
index 0000000..ff6aa9c
--- /dev/null
+++ b/examples/demo/roc.cfg
@@ -0,0 +1,24 @@
+{
+	"name": "demo",
+	"project": "demo-safe.ecf",
+	"location": ".",
+	"site_directory": "site",
+	"modules": {
+		"admin": 			{ "location": "../../modules/admin" },
+		"auth": 			{ "location": "../../modules/auth" },
+		"basic_auth": 		{ "location": "../../modules/basic_auth" },
+		"blog": 			{ "location": "../../modules/blog" },
+		"contact": 			{ "location": "../../modules/contact" },
+		"feed_aggregator": 	{ "location": "../../modules/feed_aggregator" },
+		"google_search": 	{ "location": "../../modules/google_search" },
+		"node": 			{ "location": "../../modules/node" },
+		"oauth20": 			{ "location": "../../modules/oauth20" },	
+		"openid": 			{ "location": "../../modules/openid" },
+		"recent_changes": 	{ "location": "../../modules/recent_changes" },
+		"seo": 				{ "location": "../../modules/seo" },
+		"session_auth": 	{ "location": "../../modules/session_auth" },
+		"taxonomy": 		{ "location": "../../modules/taxonomy" },
+		"files": 			{ "location": "../../modules/files" },
+		"custom_block": 	{ "location": "../../modules/custom_block" }
+	}
+}