From 8c498237872a88d0d218cf7b99653faa641d7b47 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 12:35:15 +0000
Subject: [PATCH] Divise les dependances client et vas pour apache
---
_install/{ => client}/fileToDelete.txt | 6 +-
_install/{ => client}/folderToDelete.txt | 14 +--
_install/client/listModuleApache.txt | 5 +
_install/{ => vas}/apache.conf | 138 +++++++++++------------
_install/{ => vas}/listModuleApache.txt | 32 +++---
5 files changed, 100 insertions(+), 95 deletions(-)
rename _install/{ => client}/fileToDelete.txt (98%)
rename _install/{ => client}/folderToDelete.txt (96%)
create mode 100644 _install/client/listModuleApache.txt
rename _install/{ => vas}/apache.conf (96%)
mode change 100755 => 100644
rename _install/{ => vas}/listModuleApache.txt (80%)
mode change 100755 => 100644
diff --git a/_install/fileToDelete.txt b/_install/client/fileToDelete.txt
similarity index 98%
rename from _install/fileToDelete.txt
rename to _install/client/fileToDelete.txt
index 32b675a4..ca3a9114 100644
--- a/_install/fileToDelete.txt
+++ b/_install/client/fileToDelete.txt
@@ -1,4 +1,4 @@
-javascript/externs/formreader/formreader.js
-javascript/externs/formreader/formreaderCtrl.js
-javascript/externs/formreader/formreaderDrtv.js
+javascript/externs/formreader/formreader.js
+javascript/externs/formreader/formreaderCtrl.js
+javascript/externs/formreader/formreaderDrtv.js
javascript/externs/formreader/formreaderSrvc.js
\ No newline at end of file
diff --git a/_install/folderToDelete.txt b/_install/client/folderToDelete.txt
similarity index 96%
rename from _install/folderToDelete.txt
rename to _install/client/folderToDelete.txt
index c0f1c982..a0e7984d 100644
--- a/_install/folderToDelete.txt
+++ b/_install/client/folderToDelete.txt
@@ -1,8 +1,8 @@
-javascript/app
-javascript/require
-javascript/test
-javascript/externs/openLayers/ol
-javascript/externs/openLayers/ol.ext
-javascript/externs/studio/properties
-javascript/externs/studio/javascript
+javascript/app
+javascript/require
+javascript/test
+javascript/externs/openLayers/ol
+javascript/externs/openLayers/ol.ext
+javascript/externs/studio/properties
+javascript/externs/studio/javascript
modules/vitis/javascript
\ No newline at end of file
diff --git a/_install/client/listModuleApache.txt b/_install/client/listModuleApache.txt
new file mode 100644
index 00000000..2c0309e3
--- /dev/null
+++ b/_install/client/listModuleApache.txt
@@ -0,0 +1,5 @@
+alias
+deflate
+headers
+rewrite
+ssl
\ No newline at end of file
diff --git a/_install/apache.conf b/_install/vas/apache.conf
old mode 100755
new mode 100644
similarity index 96%
rename from _install/apache.conf
rename to _install/vas/apache.conf
index bb66dfde..2281b2e2
--- a/_install/apache.conf
+++ b/_install/vas/apache.conf
@@ -1,70 +1,70 @@
-PassEnv TEMP
-Alias /rest[ENV] "[VASDIRECTORY]/rest"
- <Directory "[VASDIRECTORY]/rest">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- </Directory>
-
-Alias /doc[ENV] "[VASDIRECTORY]/doc"
- <Directory "[VASDIRECTORY]/doc">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- </Directory>
-
-Alias /public[ENV] "[VASDIRECTORY]/public"
- <Directory "[VASDIRECTORY]/public">
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- SetHandler application/x-download
- </Directory>
-Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
- <Directory "[VASDIRECTORY]/ws_data">
- AllowOverride All
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- SetHandler application/x-download
- </Directory>
-Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
- <Directory "[VASDIRECTORY]/util/proxy">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc)$">
- Order allow,deny
- Deny from all
- </Files>
- </Directory>
-Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
- <Directory "[VASDIRECTORY]/util/printserver">
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
+PassEnv TEMP
+Alias /rest[ENV] "[VASDIRECTORY]/rest"
+ <Directory "[VASDIRECTORY]/rest">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+
+Alias /doc[ENV] "[VASDIRECTORY]/doc"
+ <Directory "[VASDIRECTORY]/doc">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ </Directory>
+
+Alias /public[ENV] "[VASDIRECTORY]/public"
+ <Directory "[VASDIRECTORY]/public">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
+ <Directory "[VASDIRECTORY]/ws_data">
+ AllowOverride All
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
+ <Directory "[VASDIRECTORY]/util/proxy">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
+ <Directory "[VASDIRECTORY]/util/printserver">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
</Directory>
\ No newline at end of file
diff --git a/_install/listModuleApache.txt b/_install/vas/listModuleApache.txt
old mode 100755
new mode 100644
similarity index 80%
rename from _install/listModuleApache.txt
rename to _install/vas/listModuleApache.txt
index 4e015bb2..c2626d94
--- a/_install/listModuleApache.txt
+++ b/_install/vas/listModuleApache.txt
@@ -1,16 +1,16 @@
-actions
-alias
-cgi
-deflate
-headers
-ldap
-rewrite
-ssl
-proxy
-proxy_ajp
-proxy_connect
-proxy_fcgi
-proxy_ftp
-proxy_http
-proxy_scgi
-proxy_wstunnel
+actions
+alias
+cgi
+deflate
+headers
+ldap
+rewrite
+ssl
+proxy
+proxy_ajp
+proxy_connect
+proxy_fcgi
+proxy_ftp
+proxy_http
+proxy_scgi
+proxy_wstunnel
\ No newline at end of file
--
GitLab