From 700adff2b85818eaedc3456171b0904a88d57929 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 14:03:21 +0200
Subject: [PATCH] Change dependencies model
---
{vas/_install => _install}/apache.conf | 0
.../dependencies/mapserver/.htaccess | 0
.../dependencies/mapserver/linux/apache.conf | 0
.../dependencies/mapserver/windows/apache.conf | 0
.../dependencies/php/linux/apache.conf | 0
{vas/_install => _install}/dependencies/php/php.ini | 0
.../dependencies/php/windows/apache.conf | 0
.../dependencies/pycron/crontab.txt | 0
.../dependencies/websocket/apache.conf | 0
.../dependencies/websocket/linux/websocket_vitis | 0
.../dependencies/websocket/websocket.cfg | 0
{vas/_install => _install}/dependency.xml | 1 -
{client/_install => _install}/fileToDelete.txt | 0
{client/_install => _install}/folderToDelete.txt | 0
{vas/_install => _install}/listModuleApache.txt | 0
client/_install/dependency.xml | 10 ----------
client/_install/listModuleApache.txt | 5 -----
17 files changed, 16 deletions(-)
rename {vas/_install => _install}/apache.conf (100%)
rename {vas/_install => _install}/dependencies/mapserver/.htaccess (100%)
rename {vas/_install => _install}/dependencies/mapserver/linux/apache.conf (100%)
rename {vas/_install => _install}/dependencies/mapserver/windows/apache.conf (100%)
rename {vas/_install => _install}/dependencies/php/linux/apache.conf (100%)
rename {vas/_install => _install}/dependencies/php/php.ini (100%)
rename {vas/_install => _install}/dependencies/php/windows/apache.conf (100%)
rename {vas/_install => _install}/dependencies/pycron/crontab.txt (100%)
rename {vas/_install => _install}/dependencies/websocket/apache.conf (100%)
rename {vas/_install => _install}/dependencies/websocket/linux/websocket_vitis (100%)
rename {vas/_install => _install}/dependencies/websocket/websocket.cfg (100%)
rename {vas/_install => _install}/dependency.xml (93%)
rename {client/_install => _install}/fileToDelete.txt (100%)
mode change 100755 => 100644
rename {client/_install => _install}/folderToDelete.txt (100%)
mode change 100755 => 100644
rename {vas/_install => _install}/listModuleApache.txt (100%)
delete mode 100755 client/_install/dependency.xml
delete mode 100755 client/_install/listModuleApache.txt
diff --git a/vas/_install/apache.conf b/_install/apache.conf
similarity index 100%
rename from vas/_install/apache.conf
rename to _install/apache.conf
diff --git a/vas/_install/dependencies/mapserver/.htaccess b/_install/dependencies/mapserver/.htaccess
similarity index 100%
rename from vas/_install/dependencies/mapserver/.htaccess
rename to _install/dependencies/mapserver/.htaccess
diff --git a/vas/_install/dependencies/mapserver/linux/apache.conf b/_install/dependencies/mapserver/linux/apache.conf
similarity index 100%
rename from vas/_install/dependencies/mapserver/linux/apache.conf
rename to _install/dependencies/mapserver/linux/apache.conf
diff --git a/vas/_install/dependencies/mapserver/windows/apache.conf b/_install/dependencies/mapserver/windows/apache.conf
similarity index 100%
rename from vas/_install/dependencies/mapserver/windows/apache.conf
rename to _install/dependencies/mapserver/windows/apache.conf
diff --git a/vas/_install/dependencies/php/linux/apache.conf b/_install/dependencies/php/linux/apache.conf
similarity index 100%
rename from vas/_install/dependencies/php/linux/apache.conf
rename to _install/dependencies/php/linux/apache.conf
diff --git a/vas/_install/dependencies/php/php.ini b/_install/dependencies/php/php.ini
similarity index 100%
rename from vas/_install/dependencies/php/php.ini
rename to _install/dependencies/php/php.ini
diff --git a/vas/_install/dependencies/php/windows/apache.conf b/_install/dependencies/php/windows/apache.conf
similarity index 100%
rename from vas/_install/dependencies/php/windows/apache.conf
rename to _install/dependencies/php/windows/apache.conf
diff --git a/vas/_install/dependencies/pycron/crontab.txt b/_install/dependencies/pycron/crontab.txt
similarity index 100%
rename from vas/_install/dependencies/pycron/crontab.txt
rename to _install/dependencies/pycron/crontab.txt
diff --git a/vas/_install/dependencies/websocket/apache.conf b/_install/dependencies/websocket/apache.conf
similarity index 100%
rename from vas/_install/dependencies/websocket/apache.conf
rename to _install/dependencies/websocket/apache.conf
diff --git a/vas/_install/dependencies/websocket/linux/websocket_vitis b/_install/dependencies/websocket/linux/websocket_vitis
similarity index 100%
rename from vas/_install/dependencies/websocket/linux/websocket_vitis
rename to _install/dependencies/websocket/linux/websocket_vitis
diff --git a/vas/_install/dependencies/websocket/websocket.cfg b/_install/dependencies/websocket/websocket.cfg
similarity index 100%
rename from vas/_install/dependencies/websocket/websocket.cfg
rename to _install/dependencies/websocket/websocket.cfg
diff --git a/vas/_install/dependency.xml b/_install/dependency.xml
similarity index 93%
rename from vas/_install/dependency.xml
rename to _install/dependency.xml
index 7efd2591..f0370de2 100755
--- a/vas/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -3,7 +3,6 @@
<installer>
<schema>
<name>s_vitis</name>
- <version>2018.05.00</version>
<dependenciesCollection>
<dependency>
<name>postgres</name>
diff --git a/client/_install/fileToDelete.txt b/_install/fileToDelete.txt
old mode 100755
new mode 100644
similarity index 100%
rename from client/_install/fileToDelete.txt
rename to _install/fileToDelete.txt
diff --git a/client/_install/folderToDelete.txt b/_install/folderToDelete.txt
old mode 100755
new mode 100644
similarity index 100%
rename from client/_install/folderToDelete.txt
rename to _install/folderToDelete.txt
diff --git a/vas/_install/listModuleApache.txt b/_install/listModuleApache.txt
similarity index 100%
rename from vas/_install/listModuleApache.txt
rename to _install/listModuleApache.txt
diff --git a/client/_install/dependency.xml b/client/_install/dependency.xml
deleted file mode 100755
index d550d0ab..00000000
--- a/client/_install/dependency.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Core -->
-<installer>
- <dependenciesCollection>
- <dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
- </dependency>
- </dependenciesCollection>
-</installer>
diff --git a/client/_install/listModuleApache.txt b/client/_install/listModuleApache.txt
deleted file mode 100755
index 90a6e693..00000000
--- a/client/_install/listModuleApache.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-alias
-deflate
-headers
-rewrite
-ssl
\ No newline at end of file
--
GitLab