From f77944bfc6374a4d364e03f55ae84e36c6f9f48a Mon Sep 17 00:00:00 2001
From: Camilo Carromeu <camilo@carromeu.com>
Date: Thu, 29 Sep 2016 16:05:23 -0400
Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20na=20estrutura=20da=20ins?=
 =?UTF-8?q?t=C3=A2ncia-base.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Visando adaptar ao uso de repositórios GIT.
---
 .gitignore                                    | 12 +++++-----
 app/.htaccess => .htaccess                    |  0
 Vagrantfile                                   | 24 +++++++++++++++++++
 app/index.php                                 |  2 --
 box-php7/Vagrantfile                          | 14 -----------
 box/Vagrantfile                               | 14 -----------
 box/{ => php5}/bootstrap.sh                   | 16 ++++++-------
 box/{ => php5}/settings/000-default.conf      |  0
 box/{ => php5}/settings/apache2.conf          |  0
 {box-php7 => box/php5}/settings/cron          |  0
 box/{ => php5}/settings/pg_hba.conf           |  1 +
 box/{ => php5}/settings/php_cli.ini           |  0
 box/{ => php5}/settings/php_web.ini           |  0
 box/{ => php5}/settings/postgresql.conf       |  0
 box/{ => php5}/settings/sshd_config           |  0
 {box-php7 => box/php7}/bootstrap.sh           |  0
 box/{ => php7}/settings/cron                  |  0
 {box-php7 => box/php7}/settings/nginx-default |  0
 {box-php7 => box/php7}/settings/pg_hba.conf   |  0
 {box-php7 => box/php7}/settings/php-cli.ini   |  0
 {box-php7 => box/php7}/settings/php-fpm.ini   |  0
 .../php7}/settings/postgresql.conf            |  0
 {box-php7 => box/php7}/settings/sshd_config   |  0
 composer.json                                 |  4 ++--
 {app/configure => configure}/.htaccess        |  0
 {app/configure => configure}/alert.xml        |  0
 {app/configure => configure}/api.xml          |  0
 {app/configure => configure}/archive.xml      |  0
 {app/configure => configure}/attribute.xml    |  0
 {app/configure => configure}/business.xml     |  0
 {app/configure => configure}/ldap.xml         |  0
 {app/configure => configure}/log.xml          |  0
 {app/configure => configure}/mail.xml         |  0
 {app/configure => configure}/security.xml     |  0
 {app/configure => configure}/shopping.xml     |  0
 {app/configure => configure}/social.xml       |  0
 {app/configure => configure}/titan.xml        |  0
 {app/configure => configure}/tool.xml         |  0
 {app/configure => configure}/type.xml         |  0
 {app/doc => doc}/.htaccess                    |  0
 index.php                                     |  3 +++
 {app/section => section}/.htaccess            |  0
 {app/section => section}/access/alert.xml     |  0
 {app/section => section}/access/all.xml       |  0
 .../section => section}/access/config.inc.xml |  0
 {app/section => section}/access/list.xml      |  0
 {app/section => section}/access/log.xml       |  0
 .../section => section}/access/permission.xml |  0
 {app/section => section}/access/type.xml      |  0
 {app/section => section}/access/user.xml      |  0
 .../archive/config.inc.xml                    |  0
 {app/section => section}/archive/create.xml   |  0
 {app/section => section}/home/config.inc.xml  |  0
 {app/section => section}/manager/all.xml      |  0
 .../manager/config.inc.xml                    |  0
 {app/section => section}/manager/list.xml     |  0
 {app/section => section}/manager/modify.xml   |  0
 app/titan.php => titan.php                    |  0
 {app/update => update}/.htaccess              |  0
 {app/update => update}/VERSION                |  0
 {app/update => update}/app/production.txt     |  0
 {app/update => update}/app/test.txt           |  0
 {app/update => update}/blacklist.txt          |  0
 db/last.sql => update/initialize.sql          |  0
 64 files changed, 44 insertions(+), 46 deletions(-)
 rename app/.htaccess => .htaccess (100%)
 create mode 100644 Vagrantfile
 delete mode 100644 app/index.php
 delete mode 100644 box-php7/Vagrantfile
 delete mode 100644 box/Vagrantfile
 rename box/{ => php5}/bootstrap.sh (77%)
 rename box/{ => php5}/settings/000-default.conf (100%)
 rename box/{ => php5}/settings/apache2.conf (100%)
 rename {box-php7 => box/php5}/settings/cron (100%)
 rename box/{ => php5}/settings/pg_hba.conf (98%)
 rename box/{ => php5}/settings/php_cli.ini (100%)
 rename box/{ => php5}/settings/php_web.ini (100%)
 rename box/{ => php5}/settings/postgresql.conf (100%)
 rename box/{ => php5}/settings/sshd_config (100%)
 rename {box-php7 => box/php7}/bootstrap.sh (100%)
 rename box/{ => php7}/settings/cron (100%)
 rename {box-php7 => box/php7}/settings/nginx-default (100%)
 rename {box-php7 => box/php7}/settings/pg_hba.conf (100%)
 rename {box-php7 => box/php7}/settings/php-cli.ini (100%)
 rename {box-php7 => box/php7}/settings/php-fpm.ini (100%)
 rename {box-php7 => box/php7}/settings/postgresql.conf (100%)
 rename {box-php7 => box/php7}/settings/sshd_config (100%)
 rename {app/configure => configure}/.htaccess (100%)
 rename {app/configure => configure}/alert.xml (100%)
 rename {app/configure => configure}/api.xml (100%)
 rename {app/configure => configure}/archive.xml (100%)
 rename {app/configure => configure}/attribute.xml (100%)
 rename {app/configure => configure}/business.xml (100%)
 rename {app/configure => configure}/ldap.xml (100%)
 rename {app/configure => configure}/log.xml (100%)
 rename {app/configure => configure}/mail.xml (100%)
 rename {app/configure => configure}/security.xml (100%)
 rename {app/configure => configure}/shopping.xml (100%)
 rename {app/configure => configure}/social.xml (100%)
 rename {app/configure => configure}/titan.xml (100%)
 rename {app/configure => configure}/tool.xml (100%)
 rename {app/configure => configure}/type.xml (100%)
 rename {app/doc => doc}/.htaccess (100%)
 create mode 100644 index.php
 rename {app/section => section}/.htaccess (100%)
 rename {app/section => section}/access/alert.xml (100%)
 rename {app/section => section}/access/all.xml (100%)
 rename {app/section => section}/access/config.inc.xml (100%)
 rename {app/section => section}/access/list.xml (100%)
 rename {app/section => section}/access/log.xml (100%)
 rename {app/section => section}/access/permission.xml (100%)
 rename {app/section => section}/access/type.xml (100%)
 rename {app/section => section}/access/user.xml (100%)
 rename {app/section => section}/archive/config.inc.xml (100%)
 rename {app/section => section}/archive/create.xml (100%)
 rename {app/section => section}/home/config.inc.xml (100%)
 rename {app/section => section}/manager/all.xml (100%)
 rename {app/section => section}/manager/config.inc.xml (100%)
 rename {app/section => section}/manager/list.xml (100%)
 rename {app/section => section}/manager/modify.xml (100%)
 rename app/titan.php => titan.php (100%)
 rename {app/update => update}/.htaccess (100%)
 rename {app/update => update}/VERSION (100%)
 rename {app/update => update}/app/production.txt (100%)
 rename {app/update => update}/app/test.txt (100%)
 rename {app/update => update}/blacklist.txt (100%)
 rename db/last.sql => update/initialize.sql (100%)

diff --git a/.gitignore b/.gitignore
index 998544c..1cfd785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-app/backup
-app/cache
-app/file
-app/vendor
-box/.vagrant
-box/vagrant.log
+backup
+cache
+file
+vendor
+.vagrant
+vagrant.log
diff --git a/app/.htaccess b/.htaccess
similarity index 100%
rename from app/.htaccess
rename to .htaccess
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..ac8e350
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,24 @@
+Vagrant.configure("2") do |config|
+  # To activate...
+  # - PHP 7.0, use "bento/ubuntu-16.04". 
+  # - PHP 5.6, use "debian/jessie64".
+  
+  # config.vm.box = "bento/ubuntu-16.04"
+  config.vm.box = "debian/jessie64"
+  
+  config.vm.network "forwarded_port", guest: 80, host: 8090
+  config.vm.network "forwarded_port", guest: 5432, host: 5431
+  
+  config.vm.network "private_network", ip: "192.168.33.10"
+  
+  config.vm.synced_folder ".", "/var/www/app", type: "virtualbox"
+  config.vm.synced_folder "db", "/var/lib/postgresql/db", type: "virtualbox"
+  config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+  
+  # To activate...
+  # - PHP 7.0, use "box/php7/bootstrap.sh". 
+  # - PHP 5.6, use "box/php5/bootstrap.sh".
+  
+  # config.vm.provision "shell", path: "box/php7/bootstrap.sh"
+  config.vm.provision "shell", path: "box/php5/bootstrap.sh"
+end
diff --git a/app/index.php b/app/index.php
deleted file mode 100644
index 5eaf964..0000000
--- a/app/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-header ('Location: titan.php');
\ No newline at end of file
diff --git a/box-php7/Vagrantfile b/box-php7/Vagrantfile
deleted file mode 100644
index 1abe741..0000000
--- a/box-php7/Vagrantfile
+++ /dev/null
@@ -1,14 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "bento/ubuntu-16.04"
-  
-  config.vm.network "forwarded_port", guest: 80, host: 8090
-  config.vm.network "forwarded_port", guest: 5432, host: 5431
-  
-  config.vm.network "private_network", ip: "192.168.33.10"
-  
-  config.vm.synced_folder "../app", "/var/www/app", type: "virtualbox"
-  config.vm.synced_folder "../db", "/var/lib/postgresql/db", type: "virtualbox"
-  config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
-  
-  config.vm.provision "shell", path: "bootstrap.sh"
-end
diff --git a/box/Vagrantfile b/box/Vagrantfile
deleted file mode 100644
index ecf5405..0000000
--- a/box/Vagrantfile
+++ /dev/null
@@ -1,14 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "debian/jessie64"
-  
-  config.vm.network "forwarded_port", guest: 80, host: 8090
-  config.vm.network "forwarded_port", guest: 5432, host: 5431
-  
-  config.vm.network "private_network", ip: "192.168.33.10"
-  
-  config.vm.synced_folder "../app", "/var/www/app", type: "virtualbox"
-  config.vm.synced_folder "../db", "/var/lib/postgresql/db", type: "virtualbox"
-  config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
-  
-  config.vm.provision "shell", path: "bootstrap.sh"
-end
diff --git a/box/bootstrap.sh b/box/php5/bootstrap.sh
similarity index 77%
rename from box/bootstrap.sh
rename to box/php5/bootstrap.sh
index c91c3ef..0efa59a 100644
--- a/box/bootstrap.sh
+++ b/box/php5/bootstrap.sh
@@ -70,9 +70,9 @@ echo "Configuring services..."
 
 echo "PostgreSQL..."
 
-cp -f /vagrant/settings/pg_hba.conf /etc/postgresql/9.4/main/pg_hba.conf
+cp -f /vagrant/box/php5/settings/pg_hba.conf /etc/postgresql/9.4/main/pg_hba.conf
 
-cp -f /vagrant/settings/postgresql.conf /etc/postgresql/9.4/main/postgresql.conf
+cp -f /vagrant/box/php5/settings/postgresql.conf /etc/postgresql/9.4/main/postgresql.conf
 
 /etc/init.d/postgresql restart
 
@@ -80,17 +80,17 @@ echo "Done!"
 
 echo "Apache and PHP..."
 
-cp -f /vagrant/settings/php_web.ini /etc/php5/apache2/php.ini
+cp -f /vagrant/box/php5/settings/php_web.ini /etc/php5/apache2/php.ini
 
-cp -f /vagrant/settings/php_cli.ini /etc/php5/cli/php.ini
+cp -f /vagrant/box/php5/settings/php_cli.ini /etc/php5/cli/php.ini
 
 rm -rf /var/www/html
 
 mkdir -p /var/www/log
 
-cp -f /vagrant/settings/apache2.conf /etc/apache2/apache2.conf
+cp -f /vagrant/box/php5/settings/apache2.conf /etc/apache2/apache2.conf
 
-cp -f /vagrant/settings/000-default.conf /etc/apache2/sites-available/000-default.conf
+cp -f /vagrant/box/php5/settings/000-default.conf /etc/apache2/sites-available/000-default.conf
 
 a2enmod rewrite
 
@@ -100,7 +100,7 @@ echo "Done!"
 
 echo "SSH..."
 
-cp -f /vagrant/settings/sshd_config /etc/ssh/sshd_config
+cp -f /vagrant/box/php5/settings/sshd_config /etc/ssh/sshd_config
 
 /etc/init.d/ssh restart
 
@@ -108,7 +108,7 @@ echo "Done!"
 
 echo "CRON..."
 
-cp /vagrant/settings/cron /etc/cron.d/titan
+cp /vagrant/box/php5/settings/cron /etc/cron.d/titan
 
 /etc/init.d/cron reload
 /etc/init.d/cron restart
diff --git a/box/settings/000-default.conf b/box/php5/settings/000-default.conf
similarity index 100%
rename from box/settings/000-default.conf
rename to box/php5/settings/000-default.conf
diff --git a/box/settings/apache2.conf b/box/php5/settings/apache2.conf
similarity index 100%
rename from box/settings/apache2.conf
rename to box/php5/settings/apache2.conf
diff --git a/box-php7/settings/cron b/box/php5/settings/cron
similarity index 100%
rename from box-php7/settings/cron
rename to box/php5/settings/cron
diff --git a/box/settings/pg_hba.conf b/box/php5/settings/pg_hba.conf
similarity index 98%
rename from box/settings/pg_hba.conf
rename to box/php5/settings/pg_hba.conf
index 8bf78d1..175ef3c 100644
--- a/box/settings/pg_hba.conf
+++ b/box/php5/settings/pg_hba.conf
@@ -90,6 +90,7 @@ local   all             postgres                                peer
 local   all             all                                     trust
 # IPv4 local connections:
 host    all             all             127.0.0.1/32            md5
+host    all             all             10.0.2.2/32             trust
 # IPv6 local connections:
 host    all             all             ::1/128                 md5
 # Allow replication connections from localhost, by a user with the
diff --git a/box/settings/php_cli.ini b/box/php5/settings/php_cli.ini
similarity index 100%
rename from box/settings/php_cli.ini
rename to box/php5/settings/php_cli.ini
diff --git a/box/settings/php_web.ini b/box/php5/settings/php_web.ini
similarity index 100%
rename from box/settings/php_web.ini
rename to box/php5/settings/php_web.ini
diff --git a/box/settings/postgresql.conf b/box/php5/settings/postgresql.conf
similarity index 100%
rename from box/settings/postgresql.conf
rename to box/php5/settings/postgresql.conf
diff --git a/box/settings/sshd_config b/box/php5/settings/sshd_config
similarity index 100%
rename from box/settings/sshd_config
rename to box/php5/settings/sshd_config
diff --git a/box-php7/bootstrap.sh b/box/php7/bootstrap.sh
similarity index 100%
rename from box-php7/bootstrap.sh
rename to box/php7/bootstrap.sh
diff --git a/box/settings/cron b/box/php7/settings/cron
similarity index 100%
rename from box/settings/cron
rename to box/php7/settings/cron
diff --git a/box-php7/settings/nginx-default b/box/php7/settings/nginx-default
similarity index 100%
rename from box-php7/settings/nginx-default
rename to box/php7/settings/nginx-default
diff --git a/box-php7/settings/pg_hba.conf b/box/php7/settings/pg_hba.conf
similarity index 100%
rename from box-php7/settings/pg_hba.conf
rename to box/php7/settings/pg_hba.conf
diff --git a/box-php7/settings/php-cli.ini b/box/php7/settings/php-cli.ini
similarity index 100%
rename from box-php7/settings/php-cli.ini
rename to box/php7/settings/php-cli.ini
diff --git a/box-php7/settings/php-fpm.ini b/box/php7/settings/php-fpm.ini
similarity index 100%
rename from box-php7/settings/php-fpm.ini
rename to box/php7/settings/php-fpm.ini
diff --git a/box-php7/settings/postgresql.conf b/box/php7/settings/postgresql.conf
similarity index 100%
rename from box-php7/settings/postgresql.conf
rename to box/php7/settings/postgresql.conf
diff --git a/box-php7/settings/sshd_config b/box/php7/settings/sshd_config
similarity index 100%
rename from box-php7/settings/sshd_config
rename to box/php7/settings/sshd_config
diff --git a/composer.json b/composer.json
index 49e098c..07ba2cf 100644
--- a/composer.json
+++ b/composer.json
@@ -13,9 +13,9 @@
 	],
 	"minimum-stability": "stable",
 	"require": {
-		"php": ">=5.2,<7.0"
+		"php": ">=5.2"
 	},
 	"config": {
-		"vendor-dir": "app/vendor"
+		"vendor-dir": "vendor"
 	}
 }
diff --git a/app/configure/.htaccess b/configure/.htaccess
similarity index 100%
rename from app/configure/.htaccess
rename to configure/.htaccess
diff --git a/app/configure/alert.xml b/configure/alert.xml
similarity index 100%
rename from app/configure/alert.xml
rename to configure/alert.xml
diff --git a/app/configure/api.xml b/configure/api.xml
similarity index 100%
rename from app/configure/api.xml
rename to configure/api.xml
diff --git a/app/configure/archive.xml b/configure/archive.xml
similarity index 100%
rename from app/configure/archive.xml
rename to configure/archive.xml
diff --git a/app/configure/attribute.xml b/configure/attribute.xml
similarity index 100%
rename from app/configure/attribute.xml
rename to configure/attribute.xml
diff --git a/app/configure/business.xml b/configure/business.xml
similarity index 100%
rename from app/configure/business.xml
rename to configure/business.xml
diff --git a/app/configure/ldap.xml b/configure/ldap.xml
similarity index 100%
rename from app/configure/ldap.xml
rename to configure/ldap.xml
diff --git a/app/configure/log.xml b/configure/log.xml
similarity index 100%
rename from app/configure/log.xml
rename to configure/log.xml
diff --git a/app/configure/mail.xml b/configure/mail.xml
similarity index 100%
rename from app/configure/mail.xml
rename to configure/mail.xml
diff --git a/app/configure/security.xml b/configure/security.xml
similarity index 100%
rename from app/configure/security.xml
rename to configure/security.xml
diff --git a/app/configure/shopping.xml b/configure/shopping.xml
similarity index 100%
rename from app/configure/shopping.xml
rename to configure/shopping.xml
diff --git a/app/configure/social.xml b/configure/social.xml
similarity index 100%
rename from app/configure/social.xml
rename to configure/social.xml
diff --git a/app/configure/titan.xml b/configure/titan.xml
similarity index 100%
rename from app/configure/titan.xml
rename to configure/titan.xml
diff --git a/app/configure/tool.xml b/configure/tool.xml
similarity index 100%
rename from app/configure/tool.xml
rename to configure/tool.xml
diff --git a/app/configure/type.xml b/configure/type.xml
similarity index 100%
rename from app/configure/type.xml
rename to configure/type.xml
diff --git a/app/doc/.htaccess b/doc/.htaccess
similarity index 100%
rename from app/doc/.htaccess
rename to doc/.htaccess
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..d42f36c
--- /dev/null
+++ b/index.php
@@ -0,0 +1,3 @@
+<?php
+
+header ('Location: titan.php');
diff --git a/app/section/.htaccess b/section/.htaccess
similarity index 100%
rename from app/section/.htaccess
rename to section/.htaccess
diff --git a/app/section/access/alert.xml b/section/access/alert.xml
similarity index 100%
rename from app/section/access/alert.xml
rename to section/access/alert.xml
diff --git a/app/section/access/all.xml b/section/access/all.xml
similarity index 100%
rename from app/section/access/all.xml
rename to section/access/all.xml
diff --git a/app/section/access/config.inc.xml b/section/access/config.inc.xml
similarity index 100%
rename from app/section/access/config.inc.xml
rename to section/access/config.inc.xml
diff --git a/app/section/access/list.xml b/section/access/list.xml
similarity index 100%
rename from app/section/access/list.xml
rename to section/access/list.xml
diff --git a/app/section/access/log.xml b/section/access/log.xml
similarity index 100%
rename from app/section/access/log.xml
rename to section/access/log.xml
diff --git a/app/section/access/permission.xml b/section/access/permission.xml
similarity index 100%
rename from app/section/access/permission.xml
rename to section/access/permission.xml
diff --git a/app/section/access/type.xml b/section/access/type.xml
similarity index 100%
rename from app/section/access/type.xml
rename to section/access/type.xml
diff --git a/app/section/access/user.xml b/section/access/user.xml
similarity index 100%
rename from app/section/access/user.xml
rename to section/access/user.xml
diff --git a/app/section/archive/config.inc.xml b/section/archive/config.inc.xml
similarity index 100%
rename from app/section/archive/config.inc.xml
rename to section/archive/config.inc.xml
diff --git a/app/section/archive/create.xml b/section/archive/create.xml
similarity index 100%
rename from app/section/archive/create.xml
rename to section/archive/create.xml
diff --git a/app/section/home/config.inc.xml b/section/home/config.inc.xml
similarity index 100%
rename from app/section/home/config.inc.xml
rename to section/home/config.inc.xml
diff --git a/app/section/manager/all.xml b/section/manager/all.xml
similarity index 100%
rename from app/section/manager/all.xml
rename to section/manager/all.xml
diff --git a/app/section/manager/config.inc.xml b/section/manager/config.inc.xml
similarity index 100%
rename from app/section/manager/config.inc.xml
rename to section/manager/config.inc.xml
diff --git a/app/section/manager/list.xml b/section/manager/list.xml
similarity index 100%
rename from app/section/manager/list.xml
rename to section/manager/list.xml
diff --git a/app/section/manager/modify.xml b/section/manager/modify.xml
similarity index 100%
rename from app/section/manager/modify.xml
rename to section/manager/modify.xml
diff --git a/app/titan.php b/titan.php
similarity index 100%
rename from app/titan.php
rename to titan.php
diff --git a/app/update/.htaccess b/update/.htaccess
similarity index 100%
rename from app/update/.htaccess
rename to update/.htaccess
diff --git a/app/update/VERSION b/update/VERSION
similarity index 100%
rename from app/update/VERSION
rename to update/VERSION
diff --git a/app/update/app/production.txt b/update/app/production.txt
similarity index 100%
rename from app/update/app/production.txt
rename to update/app/production.txt
diff --git a/app/update/app/test.txt b/update/app/test.txt
similarity index 100%
rename from app/update/app/test.txt
rename to update/app/test.txt
diff --git a/app/update/blacklist.txt b/update/blacklist.txt
similarity index 100%
rename from app/update/blacklist.txt
rename to update/blacklist.txt
diff --git a/db/last.sql b/update/initialize.sql
similarity index 100%
rename from db/last.sql
rename to update/initialize.sql