diff --git a/.gitignore b/.gitignore index 73aa417f82..f95b1a4b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,61 @@ +# Exclude common IDE project files /nbproject -/config/custom_files -/config/templates -/config/topics -/config/wm -/config/minilogos -/config/status -/config/stamp -/config/configuration.yml -/vendor -/plugins -/node_modules -composer.phar -behat.yml -/datas +/.idea + +# Exclude javascript dependencies folder /www/assets /tmp-assets + +# Exclude node.js dependencies folder +/node_modules + +# Exclude compiled LESS folder +/www/skins/build + +# Exclude compiled javascript test fixture folder /www/scripts/tests/fixtures -/.vagrant/ -/bin/ + +# Exclude configuration folder exception the configuration sample file +/config +!/config/configuration.sample.yml + +# Exclude generated proxies from doctrine2 +/resources/proxies + +# Exclude temporaries resources (zip files, quarantine documents etc ..) folder +/tmp + +# Exclude cache folder +/cache + +# Exclude log folder +/logs + +# Exclude plugin folder +/plugins +# Excluse assets plugin folder +/www/plugins + +# Exclude folder for storing documents (images, videos, PDF) and their sub-definitions +/datas + +# Exclude dependencies folder +/vendor + +# Exclude package's binaries folder except the Phraseanet's ones +/bin +!/bin/console +!/bin/developer +!/bin/setup + +# Exclude composer +composer.phar + +# Exclude behat configuration file +behat.yml + +# Exclude vagrant configuration file +.vagrant + +# Exclude crossdomain.xml file it's generated +/www/crossdomain.xml diff --git a/.travis.yml b/.travis.yml index bc741737f5..244d038df7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,6 @@ before_script: - echo 'extension="memcached.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcached.ini - echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini - yes | pecl install imagick - - wget http://sphinxsearch.com/files/sphinx-2.0.6-release.tar.gz - - tar xzf sphinx-2.0.6-release.tar.gz - - sh -c "cd sphinx-2.0.6-release && wget http://snowball.tartarus.org/dist/libstemmer_c.tgz && tar xzf libstemmer_c.tgz && ./configure --with-libstemmer --with-iconv --with-mysql --enable-id64 --quiet && make -j --quiet && sudo make install" - - sudo mkdir -p /var/sphinx/datas - - sudo chmod -R 0777 /var/sphinx - mysql -e 'create database update39_test;create database ab_test;create database db_test; create database ab_unitTests; create database db_unitTests;' - sudo mysql -e "GRANT ALL PRIVILEGES ON ab_unitTests.* TO 'phraseaUnitTests'@'localhost' IDENTIFIED BY 'iWvGxPE8' WITH GRANT OPTION" - sudo mysql -e "GRANT ALL PRIVILEGES ON db_unitTests.* TO 'phraseaUnitTests'@'localhost' IDENTIFIED BY 'iWvGxPE8' WITH GRANT OPTION" @@ -66,7 +61,7 @@ script: bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y -v; bin/developer ini:setup-tests-dbs -v; fi" - - php hudson/cleanupSubdefs.php + - php resources/hudson/cleanupSubdefs.php #sqlite db generation should occur once Phraseanet is up to date : - bin/developer phraseanet:regenerate-sqlite - ./node_modules/.bin/grunt test diff --git a/Gruntfile.js b/Gruntfile.js index 78c09c4753..3c8c06b160 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -20,7 +20,8 @@ module.exports = function(grunt) { all: ['www/include/js/tests/*.html'] }, clean: { - "assets": ["<%= path.bower %>", "<%= path.asset %>"] + "assets": ["<%= path.asset %>"], + "bower": ["<%= path.bower %>"] }, bower: { install: { @@ -253,6 +254,32 @@ module.exports = function(grunt) { "dest": "<%= path.asset %>/normalize-css/", "flatten": true }, + "sinon-chai": { + "expand": true, + "src": [ + "<%= path.bower %>/sinon-chai/lib/sinon-chai.js", + "<%= path.bower %>/sinon-chai/LICENCE.txt", + ], + "dest": "<%= path.asset %>/sinon-chai/", + "flatten": true + }, + "sinonjs": { + "expand": true, + "src": [ + "<%= path.bower %>/sinonjs/sinon.js" + ], + "dest": "<%= path.asset %>/sinonjs/", + "flatten": true + }, + "squire": { + "expand": true, + "src": [ + "<%= path.bower %>/squire/src/Squire.js", + "<%= path.bower %>/squire/LICENCE" + ], + "dest": "<%= path.asset %>/squire/", + "flatten": true + }, "qunit": { "expand": true, "src": [ @@ -390,6 +417,7 @@ module.exports = function(grunt) { "copy:blueimp", "copy:bootstrap", "copy:bootstrap-multiselect", + "copy:chai", "copy:font-awesome", "copy:geonames-server-jquery-plugin", "copy:humane-js", @@ -402,9 +430,16 @@ module.exports = function(grunt) { "copy:jquery-ui", "copy:jquery.treeview", "copy:json2", + "copy:js-fixtures", "copy:modernizr", "copy:normalize", + "copy:normalize", + "copy:qunit", + "copy:mocha", "copy:requirejs", + "copy:sinon-chai", + "copy:sinonjs", + "copy:squire", "copy:swfobject", "copy:tinymce", "copy:underscore", @@ -416,7 +451,8 @@ module.exports = function(grunt) { "bower", "copy-deps", "bower_postinst", - "copy-assets" + "copy-assets", + "clean:bower" ]); grunt.registerTask('test', ["shell:generate_js_fixtures", "qunit", "mocha_phantomjs"]); }; diff --git a/Vagrantfile b/Vagrantfile index a1b93fb5e6..2b68429209 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,11 +1,15 @@ require 'yaml' +unless Vagrant.has_plugin?("vagrant-hostsupdater") + raise 'vagrant-hostmanager is not installed! please run "vagrant plugin install vagrant-hostsupdater' +end + root = File.dirname(File.expand_path(__FILE__)) Vagrant.configure("2") do |config| - Dir.glob(root+"/vagrant/vms/**/puphpet/config.yaml").each do|f| - dir = File.dirname(File.expand_path(f)+"/..") - base_path = dir[0..-21] + Dir.glob(root+"/resources/vagrant/vms/**/puphpet/config.yaml").each do|f| + dir = File.dirname(File.expand_path(f+"/..")) + base_path = dir configValues = YAML.load_file(f) data = configValues['vagrantfile-local'] @@ -167,7 +171,7 @@ Vagrant.configure("2") do |config| node.vm.provision "shell" do |s| s.path = "#{base_path}/puphpet/shell/initial-setup.sh" - s.args = "/vagrant/vagrant/vms/#{data['name']}/puphpet" + s.args = "/vagrant/resources/vagrant/vms/#{data['name']}/puphpet" end node.vm.provision "shell" do |kg| diff --git a/bin/console b/bin/console index b3ce257b10..003a4ecdba 100755 --- a/bin/console +++ b/bin/console @@ -12,6 +12,7 @@ namespace KonsoleKommander; use Alchemy\Phrasea\Command\Plugin\ListPlugin; +use Alchemy\Phrasea\Command\Setup\CrossDomainGenerator; use Alchemy\Phrasea\Command\Setup\H264ConfigurationDumper; use Alchemy\Phrasea\Command\Setup\H264MappingGenerator; use Alchemy\Phrasea\Command\SearchEngine\IndexCreateCommand; @@ -116,6 +117,7 @@ $cli->command(new H264ConfigurationDumper()); $cli->command(new H264MappingGenerator()); $cli->command(new XSendFileConfigurationDumper()); $cli->command(new XSendFileMappingGenerator()); +$cli->command(new CrossDomainGenerator()); if ($cli['phraseanet.SE']->getName() === 'ElasticSearch') { $cli->command(new IndexCreateCommand()); diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/.gitkeep b/cache/.gitkeep similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/.gitkeep rename to cache/.gitkeep diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index f6a428e80c..09886a77ed 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -79,8 +79,12 @@ main: host: 127.0.0.1 port: 6700 storage: - subdefs: - default-dir: null + subdefs:null + cache: null + log : null + download: null + lazaret: null + caption: null bridge: youtube: enabled: false @@ -202,3 +206,29 @@ api_cors: session: idle: 0 lifetime: 604800 # 1 week +crossdomain: + site-control: 'master-only' + allow-access-from: + - + domain: '*.example.com' + secure: 'false' + - + domain: 'www.example.com' + secure: 'true' + to-ports: '507,516-523' + allow-access-from-identity: + - + fingerprint-algorithm: 'sha-1' + fingerprint: '01:23:45:67:89:ab:cd:ef:01:23:45:67:89:ab:cd:ef:01:23:45:67' + - + fingerprint-algorithm: 'sha256' + fingerprint: '01:23:45:67:89:ab:cd:ef:01:23:45:67:89:ab:cd:ef:01:23:45:67' + allow-http-request-headers-from: + - + domain: '*.bar.com' + secure: 'true' + headers: 'SOAPAction, X-Foo*' + - + domain: 'foo.example.com' + secure: 'false' + headers: 'Authorization,X-Foo*' diff --git a/config/custom_files/.gitignore b/config/custom_files/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/custom_files/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/.gitkeep b/config/custom_files/.gitkeep similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/.gitkeep rename to config/custom_files/.gitkeep diff --git a/config/minilogos/.gitignore b/config/minilogos/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/minilogos/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-always/.gitkeep b/config/minilogos/.gitkeep similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-always/.gitkeep rename to config/minilogos/.gitkeep diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-once/.gitkeep b/config/presentation/.gitkeep similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-once/.gitkeep rename to config/presentation/.gitkeep diff --git a/config/stamp/.gitignore b/config/stamp/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/stamp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/datas/.placeholder b/config/stamp/.gitkeep similarity index 100% rename from datas/.placeholder rename to config/stamp/.gitkeep diff --git a/config/status/.gitignore b/config/status/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/status/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp b/config/status/.gitkeep similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp rename to config/status/.gitkeep diff --git a/config/templates/mobile/.gitignore b/config/templates/mobile/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/templates/mobile/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/config/templates/mobile/.gitkeep b/config/templates/mobile/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/templates/web/.gitignore b/config/templates/web/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/templates/web/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/config/templates/web/.gitkeep b/config/templates/web/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/topics/.gitignore b/config/topics/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/topics/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/config/topics/.gitkeep b/config/topics/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/wm/.gitignore b/config/wm/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/config/wm/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/config/wm/.gitkeep b/config/wm/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/datas/.gitkeep b/datas/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/functionnal-tests/api/config/keys.conf.sample.yml b/functionnal-tests/api/config/keys.conf.sample.yml deleted file mode 100644 index 01869b5035..0000000000 --- a/functionnal-tests/api/config/keys.conf.sample.yml +++ /dev/null @@ -1,4 +0,0 @@ -dailymotion: - public_key: - secret_key: - dev_token: diff --git a/functionnal-tests/api/dailymotion.php b/functionnal-tests/api/dailymotion.php deleted file mode 100644 index c287c1a55b..0000000000 --- a/functionnal-tests/api/dailymotion.php +++ /dev/null @@ -1,74 +0,0 @@ -register('upload:dailymotion') - ->setDescription('Test upload on dailymotion API') - ->setCode(function (InputInterface $input, OutputInterface $output) use ($core) { - try { - $configuration = Yaml::parse(__DIR__. '/config/keys.conf.yml'); - } catch(\Exception $e) { - $output->writeln('could not parse configuration file'); - return; - } - - - $appbox = \appbox::get_instance($core); - - $found = false; - foreach ($appbox->get_databoxes() as $databox) { - /* @var $databox \databox */ - $sql = 'SELECT record_id FROM record WHERE type="video" AND ( - mime="video/mp4" OR mime="video/quicktime" OR mime="video/x-msvideo" OR mime="video/x-msvideo" - ) LIMIT 1'; - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $rows = $stmt->fetch(\PDO::FETCH_ASSOC); - if(1 === count($rows)) { - $found = true; - $record = $databox->get_record($rows['record_id']); - break; - } - unset($stmt); - } - - if (!$found) { - $output->writeln('No video found, '); - return; - } - - $bridge = new \Bridge_Api_Dailymotion($core['Registry'], new \Bridge_Api_Auth_OAuth2()); - - $bridge->set_oauth_token($configuration['dailymotion']['dev_token']); - - $options = []; - $samples = [ - 'title' => $record->get_title(), - 'description' => 'Upload functionnal test', - 'tags' => 'phraseanet upload test dm api', - 'private' => true, - ]; - - foreach($bridge->get_fields() as $field) { - $options[$field['name']] = isset($samples[$field['name']]) ? $samples[$field['name']] : uniqid('test_upload'); - } - - try { - $idVideo = $bridge->upload($record, $options); - $output->writeln(sprintf('video id is %s', $idVideo)); - } catch(\Bridge_Exception_ActionAuthNeedReconnect $e) { - $output->writeln(sprintf('Invalid token %s', $configuration['dailymotion']['dev_token'])); - } catch(\Exception $e) { - $output->writeln(sprintf('%s : %s -> %s',get_class($e), $e->getMessage(), $e->getTraceAsString())); - } - }); - -$console->run(); diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 028c14e0af..17cfbda8f4 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -188,25 +188,25 @@ class Application extends SilexApplication error_reporting(-1); - $this['root.path'] = realpath(__DIR__ . '/../../..'); $this->environment = $environment; - mb_internal_encoding("UTF-8"); + $this->setupApplicationPaths($this); + + $this['charset'] = 'UTF-8'; + mb_internal_encoding($this['charset']); !defined('JETON_MAKE_SUBDEF') ? define('JETON_MAKE_SUBDEF', 0x01) : ''; !defined('JETON_WRITE_META_DOC') ? define('JETON_WRITE_META_DOC', 0x02) : ''; !defined('JETON_WRITE_META_SUBDEF') ? define('JETON_WRITE_META_SUBDEF', 0x04) : ''; !defined('JETON_WRITE_META') ? define('JETON_WRITE_META', 0x06) : ''; - $this['charset'] = 'UTF-8'; - $this['debug'] = $this->share(function (Application $app) { return Application::ENV_PROD !== $app->getEnvironment(); }); if ($this['debug'] === true) { ini_set('log_errors', 'on'); - ini_set('error_log', $this['root.path'] . '/logs/php_error.log'); + ini_set('error_log', $this['root.path'].'/logs/php_error.log'); } $this->register(new BasketMiddlewareProvider()); @@ -218,6 +218,7 @@ class Application extends SilexApplication $this->register(new AuthenticationManagerServiceProvider()); $this->register(new BorderManagerServiceProvider()); $this->register(new BrowserServiceProvider()); + $this->register(new FilesystemServiceProvider()); $this->register(new ConfigurationServiceProvider()); $this->register(new ConfigurationTesterServiceProvider); $this->register(new ConvertersServiceProvider()); @@ -229,7 +230,6 @@ class Application extends SilexApplication $this->register(new JMSSerializerServiceProvider()); $this->register(new FFMpegServiceProvider()); $this->register(new FeedServiceProvider()); - $this->register(new FilesystemServiceProvider()); $this->register(new FtpServiceProvider()); $this->register(new GeonamesServiceProvider()); $this['geonames.server-uri'] = $this->share(function (Application $app) { @@ -333,7 +333,7 @@ class Application extends SilexApplication $this->register(new TokensServiceProvider()); $this->register(new TwigServiceProvider(), [ 'twig.options' => [ - 'cache' => $this['root.path'].'/tmp/cache_twig/', + 'cache' => $this->share(function($app) {return $app['cache.path'].'/twig';}), ], ]); @@ -341,7 +341,7 @@ class Application extends SilexApplication 'locale_fallbacks' => ['fr'], 'translator.cache-options' => [ 'debug' => $this['debug'], - 'cache_dir' => $this['root.path'].'/tmp/translations' + 'cache_dir' => $this->share(function($app) {return $app['cache.path'].'/translations';}), ], ]); @@ -589,6 +589,8 @@ class Application extends SilexApplication { $this['twig'] = $this->share( $this->extend('twig', function ($twig, $app) { + $twig->setCache($app['cache.path'].'/twig'); + $paths = require $app['plugins.directory'] . '/twig-paths.php'; if ($app['browser']->isTablet() || $app['browser']->isMobile()) { @@ -899,4 +901,92 @@ class Application extends SilexApplication { return static::$flashTypes; } + + private function setupApplicationPaths(Application $app) + { + // app root path + $this['root.path'] = realpath(__DIR__ . '/../../..'); + // temporary resources default path such as download zip, quarantined documents etc .. + $this['tmp.path'] = $this['root.path'].'/tmp'; + + // cache path for dev env + $this['cache.dev.path'] = $app->share(function() use ($app) { + $path = sys_get_temp_dir().'/'.md5($app['root.path']); + // ensure path is created + $app['filesystem']->mkdir($path); + + return $path; + }); + + // cache path (twig, minify, translations, configuration, doctrine metas serializer metas, profiler etc ...) + $this['cache.path'] = $app->share(function() use ($app) { +// if ($app->getEnvironment() !== Application::ENV_PROD) { +// return $this['cache.dev.path']; +// } + $path = $this['root.path'].'/cache'; + if ($app['phraseanet.configuration']->isSetup()) { + $path = $app['conf']->get(['main', 'storage', 'cache'], $path); + } + // ensure path is created + $app['filesystem']->mkdir($path); + + return $path; + }); + + $app['cache.paths'] = $app->share(function() use ($app) { + return array( + self::ENV_DEV => $this['cache.path'], + self::ENV_TEST => $this['cache.path'], + self::ENV_PROD => $this['cache.path'] + ); + }); + + // log path + $this['log.path'] = $app->share(function() use ($app) { + $path = $this['root.path'].'/logs'; + if ($app['phraseanet.configuration']->isSetup()) { + return $app['conf']->get(['main', 'storage', 'log'], $path); + } + // ensure path is created + $app['filesystem']->mkdir($path); + + return $path; + }); + + // temporary download file path (zip file) + $this['tmp.download.path'] = $app->share(function() use ($app) { + $path = $this['tmp.path'].'/download'; + if ($app['phraseanet.configuration']->isSetup()) { + return $app['conf']->get(['main', 'storage', 'download'], $path); + } + // ensure path is created + $app['filesystem']->mkdir($path); + + return $path; + }); + + // quarantined file path + $this['tmp.lazaret.path'] = $app->share(function() use ($app) { + $path = $this['tmp.path'].'/lazaret'; + if ($app['phraseanet.configuration']->isSetup()) { + return $app['conf']->get(['main', 'storage', 'quarantine'], $path); + } + // ensure path is created + $app['filesystem']->mkdir($path); + + return $path; + }); + + // document caption file path + $this['tmp.caption.path'] = $app->share(function() use ($app) { + $path = $this['tmp.path'].'/caption'; + if ($app['phraseanet.configuration']->isSetup()) { + return $app['conf']->get(['main', 'storage', 'caption'], $path); + } + // ensure path is created + $app['filesystem']->mkdir($path); + + return $path; + }); + } } diff --git a/lib/Alchemy/Phrasea/Application/Root.php b/lib/Alchemy/Phrasea/Application/Root.php index fd62b9d59b..58ad41be88 100644 --- a/lib/Alchemy/Phrasea/Application/Root.php +++ b/lib/Alchemy/Phrasea/Application/Root.php @@ -61,7 +61,7 @@ return call_user_func(function ($environment = PhraseaApplication::ENV_PROD) { if (PhraseaApplication::ENV_DEV === $app->getEnvironment()) { $app->register($p = new WebProfilerServiceProvider(), [ - 'profiler.cache_dir' => $app['root.path'].'/tmp/cache/profiler', + 'profiler.cache_dir' => $app['cache.path'].'/profiler', ]); $app->mount('/_profiler', $p); diff --git a/lib/Alchemy/Phrasea/Border/Manager.php b/lib/Alchemy/Phrasea/Border/Manager.php index ff31a90754..b0bfc3ff3c 100644 --- a/lib/Alchemy/Phrasea/Border/Manager.php +++ b/lib/Alchemy/Phrasea/Border/Manager.php @@ -196,11 +196,11 @@ class Manager */ protected function bookLazaretPathfile($filename, $suffix = '') { - $output = $this->app['root.path'] . '/tmp/lazaret/lzrt_' . substr($filename, 0, 3) . '_' . $suffix . '.' . pathinfo($filename, PATHINFO_EXTENSION); + $output = $this->app['tmp.path'].'/lazaret/lzrt_' . substr($filename, 0, 3) . '_' . $suffix . '.' . pathinfo($filename, PATHINFO_EXTENSION); $infos = pathinfo($output); $n = 0; - $this->app['filesystem']->mkdir($this->app['root.path'] . '/tmp/lazaret'); + $this->app['filesystem']->mkdir($this->app['tmp.lazaret.path']); while (true) { $output = sprintf('%s/%s-%d%s', $infos['dirname'], $infos['filename'], ++ $n, (isset($infos['extension']) ? '.' . $infos['extension'] : '')); diff --git a/lib/Alchemy/Phrasea/Command/Developer/IniReset.php b/lib/Alchemy/Phrasea/Command/Developer/IniReset.php index 73b544ecf1..90267298b1 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/IniReset.php +++ b/lib/Alchemy/Phrasea/Command/Developer/IniReset.php @@ -100,12 +100,12 @@ class IniReset extends Command // inject v3.1 fixtures if ($input->getOption('v3.1')) { - $this->container['filesystem']->copy($this->container['root.path'].'/hudson/connexion.inc', $this->container['root.path'].'/config/connexion.inc'); - $this->container['filesystem']->copy($this->container['root.path'].'/hudson/_GV.php', $this->container['root.path'].'/config/_GV.php'); + $this->container['filesystem']->copy($this->container['root.path'].'/resources/hudson/connexion.inc', $this->container['root.path'].'/config/connexion.inc'); + $this->container['filesystem']->copy($this->container['root.path'].'/resources//hudson/_GV.php', $this->container['root.path'].'/config/_GV.php'); $command = $this->getApplication()->find('dbal:import'); - $content = file_get_contents($this->container['root.path'] . '/hudson/fixtures.sql'); + $content = file_get_contents($this->container['root.path'] . '/resources//hudson/fixtures.sql'); $content = str_replace('ab_test', $dbs['ab'], $content); $content = str_replace('db_test', $dbName, $content); diff --git a/lib/Alchemy/Phrasea/Command/Developer/JsFixtures.php b/lib/Alchemy/Phrasea/Command/Developer/JsFixtures.php index 827a7b49dd..7a825bc7f6 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/JsFixtures.php +++ b/lib/Alchemy/Phrasea/Command/Developer/JsFixtures.php @@ -30,12 +30,12 @@ class JsFixtures extends Command protected function doExecute(InputInterface $input, OutputInterface $output) { - $dbRefPath = __DIR__ . '/../../../../../tests/db-ref.sqlite'; + $dbRefPath = sys_get_temp_dir() . '/db-ref.sqlite'; if (!file_exists($dbRefPath)) { throw new RuntimeException('You must generate sqlite db first, run "bin/console phraseanet:regenerate-sqlite" command.'); } - copy($dbRefPath, '/tmp/db.sqlite'); + copy($dbRefPath, sys_get_temp_dir().'/db.sqlite'); $sbasId = current($this->container['phraseanet.appbox']->get_databoxes())->get_sbas_id(); $this->writeResponse($output, 'GET', '/login/', '/home/login/index.html'); diff --git a/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php b/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php index 221bc2bd44..c6ada1b311 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php +++ b/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php @@ -54,16 +54,16 @@ class RegenerateSqliteDb extends Command { parent::__construct('phraseanet:regenerate-sqlite'); - $this->setDescription("Updates the sqlite 'tests/db-ref.sqlite' database with current database definition."); + $this->setDescription("Updates the sqlite 'db-ref.sqlite' database with current database definition."); } public function doExecute(InputInterface $input, OutputInterface $output) { $fs = new Filesystem(); - $source = __DIR__ . '/../../../../../tests/db-ref.sqlite'; - $target = __DIR__ . '/../../../../../tests/db-ref.sqlite.bkp'; - $json = __DIR__ . '/../../../../../tests/fixtures.json'; + $source = sys_get_temp_dir().'/db-ref.sqlite'; + $target = sys_get_temp_dir().'/db-ref.sqlite.bkp'; + $json = sys_get_temp_dir().'/fixtures.json'; $renamed = false; if (is_file($source)) { diff --git a/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php b/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php index b54874c04e..eeef2e86d5 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php +++ b/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php @@ -37,7 +37,7 @@ class SetupTestsDbs extends Command )); } - $settings = Yaml::parse(file_get_contents(__DIR__ . '/../../../../../hudson/InstallDBs.yml')); + $settings = Yaml::parse(file_get_contents(__DIR__ . '/../../../../../resources/hudson/InstallDBs.yml')); $dbs = array(); diff --git a/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php b/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php index 8919d62346..822a55908d 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php @@ -33,7 +33,6 @@ class Uninstaller extends Command $root = $this->container['root.path']; foreach ([ - $root.'/tmp/configuration-compiled.php', $root.'/config/configuration.yml', $root.'/config/services.yml', $root.'/config/connexions.yml', @@ -42,27 +41,48 @@ class Uninstaller extends Command $root.'/config/connexion.inc', $root.'/config/_GV.php', $root.'/config/_GV.php.old', - $root.'/tmp/cache_registry.php', - $root.'/tmp/cache_registry.yml', + $root.'/config/configuration-compiled.php', ] as $file) { - if (is_file($file)) { + if ($this->container['filesystem']->exists($file)) { unlink($file); } } foreach ([ - $root.'/tmp/serializer', - $root.'/tmp/cache_twig', - $root.'/tmp/translations', - $root.'/tmp/cache_minify', - $root.'/tmp/download', - $root.'/tmp/locks', - $root.'/tmp/cache', - ] as $dir) { - if (is_dir($dir)) { + $this->container['tmp.download.path'], + $this->container['tmp.lazaret.path'], + $this->container['tmp.caption.path'], + $this->container['tmp.path'].'/sessions', + $this->container['tmp.path'].'/locks', + ] as $resource) { + if (is_dir($resource)) { $finder = new Finder(); - foreach ($finder->files()->in($dir) as $file) { - unlink($file); + foreach ($finder->files()->in($resource) as $file) { + $this->container['filesystem']->remove($file); + } + } elseif (is_file($resource)) { + $this->container['filesystem']->remove($resource); + } + } + + foreach ($this->container['cache.paths'] as $path) { + foreach ([ + $path.'/cache_registry.php', + $path.'/cache_registry.yml', + $path.'/serializer', + $path.'/doctrine', + $path.'/twig', + $path.'/translations', + $path.'/minify', + $path.'/profiler', + ] as $resource) { + if (is_dir($resource)) { + $finder = new Finder(); + foreach ($finder->files()->in($resource) as $file) { + $this->container['filesystem']->remove($file); + } + } elseif (is_file($resource)) { + $this->container['filesystem']->remove($resource); } } } diff --git a/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.php new file mode 100644 index 0000000000..6e54a4b1f2 --- /dev/null +++ b/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.php @@ -0,0 +1,45 @@ +setDescription('Generate crossdomain.xml file according to configuration'); + } + + /** + * {@inheritdoc} + */ + protected function doExecute(InputInterface $input, OutputInterface $output) + { + $configuration = $this->container['phraseanet.configuration']['crossdomain']; + + $dumper = new CrossDomainDumper(); + + $xml = $dumper->dump($configuration); + + $output->writeln($xml); + + $this->container['filesystem']->dumpFile($this->container['root.path'].'/www/crossdomain.xml', $xml); + + return ; + } +} diff --git a/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php index 8c61a92f24..ad34b56844 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php +++ b/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php @@ -72,8 +72,8 @@ class XSendFileMappingGenerator extends Command private function computeMapping($paths) { return array_merge([ - ['mount-point' => 'protected_lazaret', 'directory' => $this->container['root.path'] . '/tmp/lazaret'], - ['mount-point' => 'protected_download', 'directory' => $this->container['root.path'] . '/tmp/download'], + ['mount-point' => 'protected_lazaret', 'directory' => $this->container['tmp.lazaret.path']], + ['mount-point' => 'protected_download', 'directory' => $this->container['tmp.download.path']], ], array_map([$this, 'pathsToConf'], array_unique($paths))); } diff --git a/lib/Alchemy/Phrasea/Command/Task/SchedulerRun.php b/lib/Alchemy/Phrasea/Command/Task/SchedulerRun.php index 31d6246f8a..109147f0f9 100644 --- a/lib/Alchemy/Phrasea/Command/Task/SchedulerRun.php +++ b/lib/Alchemy/Phrasea/Command/Task/SchedulerRun.php @@ -52,7 +52,7 @@ class SchedulerRun extends Command } $this->container['signal-handler']->register([SIGINT, SIGTERM], [$this, 'signalHandler']); - $this->container['task-manager']->addSubscriber(new LockFileSubscriber($this->container['task-manager.logger'], $this->container['root.path'].'/tmp/locks')); + $this->container['task-manager']->addSubscriber(new LockFileSubscriber($this->container['task-manager.logger'], $this->container['tmp.path'].'/locks')); $this->container['task-manager']->start(); } } diff --git a/lib/Alchemy/Phrasea/Command/Task/TaskRun.php b/lib/Alchemy/Phrasea/Command/Task/TaskRun.php index ef7cdf391f..95af57fa06 100644 --- a/lib/Alchemy/Phrasea/Command/Task/TaskRun.php +++ b/lib/Alchemy/Phrasea/Command/Task/TaskRun.php @@ -61,7 +61,7 @@ class TaskRun extends Command $logger->pushHandler(new RotatingFileHandler($file->getPath(), $this->container['task-manager.logger.configuration']['max-files'], $this->container['task-manager.logger.configuration']['level'])); } - $job->addSubscriber(new LockFileSubscriber('task-'.$task->getId(), $logger, $this->container['root.path'].'/tmp/locks')); + $job->addSubscriber(new LockFileSubscriber('task-'.$task->getId(), $logger, $this->container['tmp.path'].'/locks')); $job->addSubscriber(new StopSignalSubscriber($this->container['signal-handler'], $logger)); if ($input->getOption('listen-signal')) { diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php index 0b6171f56f..d9eec78329 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php @@ -699,7 +699,7 @@ class Databox implements ControllerProviderInterface $ret['sbas_id'] = $databox_id; $ret['xml_indexed'] = $datas['xml_indexed']; $ret['thesaurus_indexed'] = $datas['thesaurus_indexed']; - + $ret['jeton_subdef'] = $datas['jeton_subdef']; if ($app['filesystem']->exists($app['root.path'] . '/config/minilogos/logopdf_' . $databox_id . '.jpg')) { $ret['printLogoURL'] = '/custom/minilogos/logopdf_' . $databox_id . '.jpg'; } diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php index b0effb8232..4617600974 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Users.php @@ -795,7 +795,7 @@ class Users implements ControllerProviderInterface $controllers->get('/import/example/csv/', function (Application $app) { - $file = new \SplFileInfo($app['root.path'] . '/lib/Fixtures/exampleImportUsers.csv'); + $file = new \SplFileInfo($app['root.path'] . '/resources/examples/example_import_users.csv'); if (!$file->isFile()) { $app->abort(400); @@ -814,7 +814,7 @@ class Users implements ControllerProviderInterface $controllers->get('/import/example/rtf/', function (Application $app) { - $file = new \SplFileInfo($app['root.path'] . '/lib/Fixtures/Fields.rtf'); + $file = new \SplFileInfo($app['root.path'] . '/resources/examples/fields.rtf'); if (!$file->isFile()) { $app->abort(400); diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1.php b/lib/Alchemy/Phrasea/Controller/Api/V1.php index 86949afa44..41763563ac 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1.php @@ -519,8 +519,8 @@ class V1 implements ControllerProviderInterface 'report' => [ 'anonymous' => $app['conf']->get(['registry', 'modules', 'anonymous-report']), ], - 'filesystem' => [ - 'noWeb' => $app['conf']->get(['main', 'storage', 'subdefs', 'default-dir']), + 'storage' => [ + 'documents' => $app['conf']->get(['main', 'storage', 'subdefs']), ], 'searchEngine' => [ 'configuration' => [ diff --git a/lib/Alchemy/Phrasea/Controller/Minifier.php b/lib/Alchemy/Phrasea/Controller/Minifier.php index 9d84dfd900..ba17e24f45 100644 --- a/lib/Alchemy/Phrasea/Controller/Minifier.php +++ b/lib/Alchemy/Phrasea/Controller/Minifier.php @@ -26,9 +26,10 @@ class Minifier implements ControllerProviderInterface $controllers = $app['controllers_factory']; $controllers->get('/', function (Application $app, Request $request) { - // cache directory path - $min_cachePath = $app['root.path'] . '/tmp/cache_minify'; + $min_cachePath = $app['cache.path'].'/minify'; + // ensure path is created + $app['filesystem']->mkdir($min_cachePath); /** * Cache file locking. Set to false if filesystem is NFS. On at least one diff --git a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php index 34307c74cb..ab3bcd847c 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php @@ -136,7 +136,7 @@ class DoDownload implements ControllerProviderInterface $mime = $subdef['mime']; $list['complete'] = true; } else { - $exportFile = $app['root.path'] . '/tmp/download/' . $token->getValue() . '.zip'; + $exportFile = $app['tmp.download.path'].'/'.$token->getValue() . '.zip'; $mime = 'application/zip'; } @@ -184,7 +184,7 @@ class DoDownload implements ControllerProviderInterface $app, $token, $list, - sprintf($app['root.path'] . '/tmp/download/%s.zip', $token->getValue()) // Dest file + sprintf($app['tmp.download.path'].'/%s.zip', $token->getValue()) // Dest file ); return $app->json([ diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Export.php b/lib/Alchemy/Phrasea/Controller/Prod/Export.php index 7d10b066ad..9c1353ba27 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Export.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Export.php @@ -223,7 +223,7 @@ class Export implements ControllerProviderInterface $app, $token, $list, - $app['root.path'] . '/tmp/download/' . $token->getValue() . '.zip' + $app['tmp.download.path'].'/'. $token->getValue() . '.zip' ); $remaingEmails = $destMails; diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php index af2477591c..44f63ff287 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php @@ -126,7 +126,7 @@ class Lazaret implements ControllerProviderInterface 'base_id' => $lazaretFile->getBaseId(), 'created' => $lazaretFile->getCreated()->format(\DateTime::ATOM), 'updated' => $lazaretFile->getUpdated()->format(\DateTime::ATOM), - 'pathname' => $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getFilename(), + 'pathname' => $app['tmp.lazaret.path'].'/'.$lazaretFile->getFilename(), 'sha256' => $lazaretFile->getSha256(), 'uuid' => $lazaretFile->getUuid(), ]; @@ -174,8 +174,8 @@ class Lazaret implements ControllerProviderInterface return $app->json($ret); } - $lazaretFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getFilename(); - $lazaretThumbFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getThumbFilename(); + $lazaretFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getFilename(); + $lazaretThumbFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getThumbFilename(); try { $borderFile = Border\File::buildFromPathfile( @@ -294,8 +294,8 @@ class Lazaret implements ControllerProviderInterface protected function denyLazaretFile(Application $app, LazaretFile $lazaretFile) { - $lazaretFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getFilename(); - $lazaretThumbFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getThumbFilename(); + $lazaretFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getFilename(); + $lazaretThumbFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getThumbFilename(); $app['EM']->remove($lazaretFile); $app['EM']->flush(); @@ -386,8 +386,8 @@ class Lazaret implements ControllerProviderInterface return $app->json($ret); } - $lazaretFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getFilename(); - $lazaretThumbFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getThumbFilename(); + $lazaretFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getFilename(); + $lazaretThumbFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getThumbFilename(); try { $media = $app['mediavorus']->guess($lazaretFileName); @@ -437,7 +437,7 @@ class Lazaret implements ControllerProviderInterface return new Response(null, 404); } - $lazaretThumbFileName = $app['root.path'] . '/tmp/lazaret/' . $lazaretFile->getThumbFilename(); + $lazaretThumbFileName = $app['tmp.lazaret.path'].'/'.$lazaretFile->getThumbFilename(); return $app['phraseanet.file-serve']->deliverFile($lazaretThumbFileName, $lazaretFile->getOriginalName(), DeliverDataInterface::DISPOSITION_INLINE, 'image/jpeg', 3600); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php index 8924ca0ba9..3252a9f382 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php @@ -252,11 +252,9 @@ class Tools implements ControllerProviderInterface $dataUri = DataURI\Parser::parse($request->request->get('image', '')); - $path = $app['root.path'] . '/tmp'; - $name = sprintf('extractor_thumb_%s', $record->get_serialize_key()); - $fileName = sprintf('%s/%s.png', $path, $name); + $fileName = sprintf('%s/%s.png', sys_get_temp_dir(), $name); file_put_contents($fileName, $dataUri->getData()); diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php index 5d3b15670f..9d4d6cdceb 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php @@ -1138,7 +1138,7 @@ class Thesaurus implements ControllerProviderInterface { list($term, $context) = $this->splitTermAndContext($request->get("t")); - $dom = $this->doSearchCandidate($app, $request->get('bid'), $request->get('pid'), $request->get('term'), $request->get('context'), $request->get('piv')); + $dom = $this->doSearchCandidate($app, $request->get('bid'), $request->get('pid'), $term, $context, $request->get('piv')); $xpath = new \DOMXPath($dom); @@ -1158,10 +1158,10 @@ class Thesaurus implements ControllerProviderInterface $candidates_list = []; for ($i = 0; $i < $candidates->length; $i ++) { if ($candidates->item($i)->getAttribute("sourceok") == "1") { - $candidates_list = [ + $candidates_list[] = array( 'id' => $candidates->item($i)->getAttribute("id"), 'field' => $candidates->item($i)->getAttribute("field"), - ]; + ); } } @@ -2948,8 +2948,8 @@ class Thesaurus implements ControllerProviderInterface $xpathth = new \DOMXPath($domth); $xpathct = new \DOMXPath($domct); - // on cherche les champs d'oe peut provenir un candidat, en fct de l'endroit oe on veut inserer le nouveau terme - $fields = []; + // on cherche les champs d'ou peut provenir un candidat, en fct de l'endroit oe on veut inserer le nouveau terme + $fields = array(); $xpathstruct = new \DOMXPath($domstruct); $nodes = $xpathstruct->query("/record/description/*[@tbranch]"); for ($i = 0; $i < $nodes->length; $i ++) { @@ -2992,7 +2992,7 @@ class Thesaurus implements ControllerProviderInterface ]; if (count($fields) > 0) { - $q = "@w='" . \thesaurus::xquery_escape($app['unicode']->remove_indexer_chars($k)) . "'"; + $q = "@w='" . \thesaurus::xquery_escape($app['unicode']->remove_indexer_chars($t)) . "'"; if ($k) { if ($k != "*") { $q .= " and @k='" . \thesaurus::xquery_escape($app['unicode']->remove_indexer_chars($k)) . "'"; diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php index d75bbc4fc1..a732ccdd6a 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php @@ -44,6 +44,7 @@ class Xmlhttp implements ControllerProviderInterface $controllers->match('openbranch_prod.j.php', 'controller.thesaurus.xmlhttp:OpenBranchJson'); $controllers->match('openbranches_prod.h.php', 'controller.thesaurus.xmlhttp:OpenBranchesHtml'); $controllers->match('openbranches_prod.x.php', 'controller.thesaurus.xmlhttp:OpenBranchesXml'); + $controllers->match('openbranches_prod.j.php', 'controller.thesaurus.xmlhttp:OpenBranchesJson'); $controllers->match('replacecandidate.j.php', 'controller.thesaurus.xmlhttp:ReplaceCandidateJson') ->before(function () use ($app) { $app['firewall']->requireAccessToModule('thesaurus'); @@ -772,72 +773,19 @@ class Xmlhttp implements ControllerProviderInterface $lthid = strlen($thid); // count occurences - if ($lthid == 1) { + if ($lthid > 1) { $dthid = str_replace('.', 'd', $thid); - - $sql = 'SELECT COUNT(DISTINCT r.record_id) AS n - FROM (thit AS t INNER JOIN record AS r USING(record_id)) - INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id - WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0'; - $sqlparm = [':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id]; + $sql = "SELECT" + . " 0+SUBSTR(t.value, " . ($lthid + 2) . ") AS k, COUNT(DISTINCT(`record_id`)) AS n" + . " FROM (thit AS t INNER JOIN record AS r USING(record_id))" + . " INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id" + . " WHERE t.value LIKE :like AND r.coll_id IN(".$lcoll.") AND (r.status^c.mask_xor)&c.mask_and=0" + . " GROUP BY k ORDER BY NULL"; + $sqlparm = array(':like' => $dthid . 'd%', ':site'=>$site, ':usr_id'=>$usr_id); $stmt = $connbas->prepare($sql); $stmt->execute($sqlparm); - $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); - $stmt->closeCursor(); - foreach ($rs as $rowbas) { - $t_nrec[$thid] = $rowbas; - } - - $sql = 'SELECT - SUBSTRING_INDEX(SUBSTR(t.value, ' . ($lthid + 1) . '), "d", 1) AS k , - COUNT(DISTINCT t.record_id) AS n - FROM (thit AS t INNER JOIN record AS r USING(record_id)) - INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id - WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0 - GROUP BY k'; - $sqlparm = [':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id]; - - $stmt = $connbas->prepare($sql); - $stmt->execute([':like' => $dthid . '%']); - $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - foreach ($rs as $rowbas) { - $t_nrec[$thid . $rowbas['k']] = $rowbas; - } - } elseif (strlen($thid) > 1) { - $dthid = str_replace('.', 'd', $thid); - $sql = 'SELECT - SUBSTRING_INDEX(SUBSTR(t.value, ' . ($lthid) . '), \'d\', 1) AS k , - COUNT(DISTINCT t.record_id) AS n - FROM (thit AS t INNER JOIN record AS r USING(record_id)) - INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id - WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0 - GROUP BY k'; - $sqlparm = [':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id]; - - $stmt = $connbas->prepare($sql); - $stmt->execute($sqlparm); - $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - foreach ($rs as $rowbas) { - $t_nrec[$thid] = $rowbas; - } - - $sql = 'SELECT - SUBSTRING_INDEX(SUBSTR(t.value, ' . ($lthid + 2) . '), \'d\', 1) AS k , - COUNT(DISTINCT t.record_id) AS n - FROM (thit AS t INNER JOIN record AS r USING(record_id)) - INNER JOIN collusr AS c ON c.site=:site AND c.usr_id=:usr_id AND r.coll_id=c.coll_id - WHERE t.value LIKE :like AND r.coll_id IN('.$lcoll.') AND (r.status^c.mask_xor)&c.mask_and=0 - GROUP BY k'; - $sqlparm = [':like' => $dthid . '%', ':site'=>$site, ':usr_id'=>$usr_id]; - - $stmt = $connbas->prepare($sql); - $stmt->execute($sqlparm); $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); $stmt->closeCursor(); @@ -879,17 +827,6 @@ class Xmlhttp implements ControllerProviderInterface if ($request->get('last')) { $class .= ( $class == '' ? '' : ' ') . 'last'; } - - $html .= '
  • ' . "\n"; - $html .= '
    ' . "\n"; - $html .= ' ' . $label . ''; - - if (isset($t_nrec[$thid])) { - $html .= ' ' . $t_nrec[$thid]['n'] . ''; - } - - $html .= "\n"; - // on dresse la liste des termes specifiques avec comme cle le synonyme dans la langue pivot $nts = 0; $tts = []; @@ -1165,6 +1102,92 @@ class Xmlhttp implements ControllerProviderInterface } } + public function OpenBranchesJson(Application $app, Request $request) + { + if ('' === ($mod = strtoupper($request->get('mod')))) { + $mod = 'TREE'; + } + + $ret = array( + 'parms'=> array( + 'bid' => $request->get('bid'), + 't' => $request->get('t'), + 'mod' => $request->get('mod'), + 'debug' => $request->get('debug') + ), + 'result'=>NULL, + 'error'=>'', + 'error_code'=>0, + ); + + if (null === ($bid = $request->get('bid'))) { + $ret['error'] = 'Missing bid parameter'; + $ret['error_code'] = 400; + + return json_encode($ret); + } + if ($mod != 'TREE' && $mod != "LIST") { + $ret['error'] = 'bad mod, TREE|LIST'; + $ret['error_code'] = 400; + + return json_encode($ret); + } + + + $databox = $app['phraseanet.appbox']->get_databox((int) $bid); + $dom = $databox->get_dom_thesaurus(); + + if (!$dom) { + $ret['error'] = 'Unable to load thesaurus'; + $ret['error_code'] = 500; + + return json_encode($ret); + } + + $xpath = $databox->get_xpath_thesaurus(); + $q = '/thesaurus'; + + if (($znode = $xpath->query($q)->item(0))) { + $q2 = '//sy'; + if ($request->get('t')) { + $t = $this->splitTermAndContext($request->get('t')); + $q2 = 'starts-with(@w, \'' . \thesaurus::xquery_escape($app['unicode']->remove_indexer_chars($t[0])) . '\')'; + if ($t[1]) + $q2 .= ' and starts-with(@k, \'' . \thesaurus::xquery_escape($app['unicode']->remove_indexer_chars($t[1])) . '\')'; + $q2 = '//sy[' . $q2 . ']'; + } + $nodes = $xpath->query($q2, $znode); + if ($mod == 'TREE') { + for ($i = 0; $i < $nodes->length; $i++) { + $nodes->item($i)->setAttribute('bold', '1'); + for ($n = $nodes->item($i)->parentNode; $n && $n->nodeType == XML_ELEMENT_NODE && $n->nodeName == 'te'; $n = $n->parentNode) { + $n->setAttribute('open', '1'); + } + } + $ret['result'] = $this->getBrancheJson($bid, $znode, $ret['result'], 0); + } else { + $ret['result'] = array(); + for ($i = 0; $i < $nodes->length; $i++) { + $n = $nodes->item($i); + $t = $n->getAttribute('v'); + $tid = $n->getAttribute('id'); + + $ret['result'][] = array( + 'id' => $n->getAttribute('id'), + 't' => $n->getAttribute('v'), + ); + } + } + } + if($request->get('debug')) { + printf("
    %s
    ", var_export($ret, true)); + // printf("
    %s
    ", json_encode($ret, JSON_PRETTY_PRINT)); + die; + } + return json_encode($ret, JSON_PRETTY_PRINT); + } + + public function OpenBranchesXml(Application $app, Request $request) { if (null === $mod = $request->get('mod')) { @@ -1233,7 +1256,44 @@ class Xmlhttp implements ControllerProviderInterface $html->appendChild($ret->createTextNode($zhtml)); } - return new Response($zhtml, 200, ['Content-Type' => 'text/xml']); + return new Response($zhtml, 200, array('Content-Type' => 'text/xml')); + } + + private function getBrancheJson($bid, $srcnode, &$ret, $depth) + { + $tid = $srcnode->getAttribute('id'); + $nts = 0; + $allsy = array(); + for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { + if ($n->nodeName == 'sy') { + $t = $n->getAttribute('v'); + $allsy[] = array( + 'id' => $n->getAttribute('id'), + 't' => $t, + 'lng' => $n->getAttribute('lng'), + 'bold' => (bool)$n->getAttribute('bold'), + ); + } elseif ($n->nodeName == 'te') { + $nts++; + } + } + + $nret = array( + 'id' => $tid, + 'nts' => $nts, + 'synonyms' => $allsy, + 'children' => array(), + ); + + for ($n = $srcnode->firstChild; $n; $n = $n->nextSibling) { + if ($n->nodeName == 'te') { + if ($n->getAttribute('open')) { + $nret['children'][] = $this->getBrancheJson($bid, $n, $ret['children'], $depth + 1); + } + } + } + + return $nret; } private function getBrancheXML($bid, $srcnode, &$html, $depth) diff --git a/lib/Alchemy/Phrasea/Core/Configuration/SessionHandlerFactory.php b/lib/Alchemy/Phrasea/Core/Configuration/SessionHandlerFactory.php index 0fd0a62647..99dbe5c8b2 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/SessionHandlerFactory.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/SessionHandlerFactory.php @@ -22,12 +22,10 @@ use Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHa class SessionHandlerFactory { private $connectionFactory; - private $root; - public function __construct(ConnectionFactory $connectionFactory, $root = null) + public function __construct(ConnectionFactory $connectionFactory) { $this->connectionFactory = $connectionFactory; - $this->root = __DIR__ . '/../../../../..'; } /** @@ -62,7 +60,7 @@ class SessionHandlerFactory ) ); case 'file': - return new NativeFileSessionHandler($this->root.'/tmp/sessions'); + return new NativeFileSessionHandler(isset($options['save-path']) ? $options['save-path'] : null); case 'redis': return new WriteCheckSessionHandler( new RedisSessionHandler( diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php index 6cab046aa4..4d3b23553a 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php @@ -61,7 +61,9 @@ class ApiOauth2ErrorsSubscriber implements EventSubscriberInterface $msg = json_encode(['msg' => $msg, 'code' => $code]); $event->setResponse(new Response($msg, $code, $headers)); } else { - $event->setResponse($this->handler->createResponseBasedOnRequest($event->getRequest(), $event->getException())); + $response = $this->handler->createResponseBasedOnRequest($event->getRequest(), $event->getException()); + $response->headers->set('Content-Type', 'text/html'); + $event->setResponse($response); } } } diff --git a/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php index 80dfc2cfcc..7eaecc3298 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php @@ -21,7 +21,9 @@ class CacheServiceProvider implements ServiceProviderInterface { public function register(Application $app) { - $app['phraseanet.cache-registry'] = $app['root.path'] . '/tmp/cache_registry.php'; + $app['phraseanet.cache-registry'] = $app->share(function () use ($app) { + return $app['cache.path'].'/cache_registry.php'; + }); $app['phraseanet.cache-compiler'] = $app->share(function () { return new Compiler(); diff --git a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php index e959b34ac6..d16756cba5 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php @@ -34,8 +34,8 @@ class ConfigurationServiceProvider implements ServiceProviderInterface $app['phraseanet.configuration.compiler'] = $app->share(function (SilexApplication $app) { return new Compiler(); }); - $app['phraseanet.configuration.config-path'] = $app['root.path'] . '/config/configuration.yml'; - $app['phraseanet.configuration.config-compiled-path'] = $app['root.path'] . '/tmp/configuration-compiled.php'; + $app['phraseanet.configuration.config-path'] = $app['root.path'].'/config/configuration.yml'; + $app['phraseanet.configuration.config-compiled-path'] = $app['root.path'].'/config/configuration-compiled.php'; $app['configuration.store'] = $app->share(function (SilexApplication $app) { return new HostConfiguration(new Configuration( diff --git a/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php index 07236a2b72..46d9b8c8c2 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php @@ -21,7 +21,10 @@ class JMSSerializerServiceProvider implements ServiceProviderInterface { public function register(Application $app) { - $app['serializer.cache-directory'] = $app['root.path'] . '/tmp/serializer/'; + $app['serializer.cache-directory'] = $app->share(function () use ($app) { + return $app['cache.path'].'/serializer/'; + }); + $app['serializer.src_directory'] = $app['root.path'] . '/vendor/jms/serializer/src/'; $app['serializer.metadata.annotation_reader'] = $app->share(function () use ($app) { diff --git a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php index 3d3c6c1fbb..395eff6142 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php @@ -37,7 +37,9 @@ class ORMServiceProvider implements ServiceProviderInterface { public function register(Application $app) { - $app['EM.sql-logger.file'] = $app['root.path'] . '/logs/doctrine-log.log'; + $app['EM.sql-logger.file'] = $app->share(function (Application $app) { + return $app['log.path'].'/doctrine-log.log'; + }); $app['EM.sql-logger.max-files'] = 5; $app['EM.sql-logger'] = $app->share(function (Application $app) { @@ -55,7 +57,7 @@ class ORMServiceProvider implements ServiceProviderInterface $annotationReader = new AnnotationReader(); $fileCacheReader = new FileCacheReader( $annotationReader, - $app['root.path']."/tmp/doctrine", + $app['cache.path'].'/doctrine', $app['debug'] ); @@ -97,7 +99,7 @@ class ORMServiceProvider implements ServiceProviderInterface $config->setMetadataDriverImpl($app['EM.driver']); - $config->setProxyDir($app['root.path'] . '/tmp/doctrine-proxies'); + $config->setProxyDir($app['root.path'].'/resources/proxies'); $config->setProxyNamespace('Alchemy\Phrasea\Model\Proxies'); $config->setAutoGenerateProxyClasses($app['debug']); $config->addEntityNamespace('Phraseanet', 'Alchemy\Phrasea\Model\Entities'); diff --git a/lib/Alchemy/Phrasea/Core/Provider/SessionHandlerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/SessionHandlerServiceProvider.php index 6c3d9c4320..54d03b0c65 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/SessionHandlerServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/SessionHandlerServiceProvider.php @@ -23,7 +23,7 @@ class SessionHandlerServiceProvider implements ServiceProviderInterface public function register(Application $app) { $app['session.storage.handler.factory'] = $app->share(function (Application $app) { - return new SessionHandlerFactory($app['cache.connection-factory'], $app['root.path']); + return new SessionHandlerFactory($app['cache.connection-factory']); }); } diff --git a/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php index 1fa0951d2c..3d8f610783 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php @@ -58,7 +58,7 @@ class TasksServiceProvider implements ServiceProviderInterface }); $app['task-manager.log-file.root'] = $app->share(function (Application $app) { - return $app['root.path'].'/logs'; + return $app['log.path']; }); $app['task-manager.log-file.factory'] = $app->share(function (Application $app) { diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 27c5909982..391b59cb4c 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -13,7 +13,7 @@ namespace Alchemy\Phrasea\Core; class Version { - protected static $number = '3.9.0-alpha.18'; + protected static $number = '3.9.0-alpha.19'; protected static $name = 'Gorgosaurus'; public static function getNumber() diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php index fbfd9361ae..304d50d2b1 100644 --- a/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php +++ b/lib/Alchemy/Phrasea/Model/Manipulator/TokenManipulator.php @@ -205,7 +205,7 @@ class TokenManipulator implements ManipulatorInterface switch ($token->getType()) { case 'download': case 'email': - $file = $this->app['root.path'] . '/tmp/download/' . $token->getValue() . '.zip'; + $file = $this->app['tmp.download.path'].'/' . $token->getValue() . '.zip'; if (is_file($file)) { unlink($file); } diff --git a/lib/Alchemy/Phrasea/Setup/Installer.php b/lib/Alchemy/Phrasea/Setup/Installer.php index eb4a304f3d..8a6c08cf4f 100644 --- a/lib/Alchemy/Phrasea/Setup/Installer.php +++ b/lib/Alchemy/Phrasea/Setup/Installer.php @@ -34,7 +34,6 @@ class Installer $this->rollbackInstall($abConn, $dbConn); try { - $this->createConfigFile($abConn, $serverName, $binaryData); $this->createAB(); $this->populateRegistryData($serverName, $dataPath, $binaryData); @@ -60,13 +59,16 @@ class Installer private function populateRegistryData($serverName, $dataPath) { - if (null === realpath($dataPath)) { + if (null === $dataPath = realpath($dataPath)) { throw new \InvalidArgumentException(sprintf('Path %s does not exist.', $dataPath)); } - $dataPath = realpath($dataPath) . DIRECTORY_SEPARATOR; - - $this->app['conf']->set(['main', 'storage', 'subdefs', 'default-dir'], $dataPath); + $this->app['conf']->set(['main', 'storage', 'subdefs'], $dataPath); + $this->app['conf']->set(['main', 'storage', 'cache'], realpath(__DIR__ . '/../../../../cache')); + $this->app['conf']->set(['main', 'storage', 'log'], realpath(__DIR__ . '/../../../../logs')); + $this->app['conf']->set(['main', 'storage', 'download'], realpath(__DIR__ . '/../../../../tmp/download')); + $this->app['conf']->set(['main', 'storage', 'lazaret'], realpath(__DIR__ . '/../../../../tmp/lazaret')); + $this->app['conf']->set(['main', 'storage', 'caption'], realpath(__DIR__ . '/../../../../tmp/caption')); $this->app['conf']->set('servername', $serverName); $this->app['conf']->set('registry', $this->app['registry.manipulator']->getRegistryData()); } @@ -134,7 +136,7 @@ class Installer foreach ($appbox->tables->table as $table) { try { - $sql = 'DROP TABLE `' . $table['name'] . '`'; + $sql = 'DROP TABLE IF EXISTS `' . $table['name'] . '`'; $stmt = $abConn->prepare($sql); $stmt->execute(); $stmt->closeCursor(); @@ -145,7 +147,7 @@ class Installer if (null !== $dbConn) { foreach ($databox->tables->table as $table) { try { - $sql = 'DROP TABLE `' . $table['name'] . '`'; + $sql = 'DROP TABLE IF EXISTS `' . $table['name'] . '`'; $stmt = $dbConn->prepare($sql); $stmt->execute(); $stmt->closeCursor(); diff --git a/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php index fb85c68556..c532a799e9 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php @@ -35,8 +35,8 @@ class FilesystemProbe extends FilesystemRequirements implements ProbeInterface ); } - if ($conf->has(['main', 'storage', 'subdefs', 'default-dir'])) { - $paths[] = $conf->get(['main', 'storage', 'subdefs', 'default-dir']); + if ($conf->has(['main', 'storage', 'subdefs'])) { + $paths[] = $conf->get(['main', 'storage', 'subdefs']); } foreach ($paths as $path) { diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php index 7a4ef3ad83..804b266ad3 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php @@ -31,16 +31,12 @@ class FilesystemRequirements extends RequirementCollection implements Requiremen $baseDir . '/config/wm', $baseDir . '/logs', $baseDir . '/tmp', - $baseDir . '/www/custom', $baseDir . '/tmp/locks', - $baseDir . '/tmp/cache_twig', - $baseDir . '/tmp/serializer', - $baseDir . '/tmp/doctrine', - $baseDir . '/tmp/cache_minify', + $baseDir . '/tmp/caption', $baseDir . '/tmp/lazaret', - $baseDir . '/tmp/desc_tmp', $baseDir . '/tmp/download', - $baseDir . '/tmp/batches' + $baseDir . '/cache', + $baseDir . '/www/custom', ]; foreach ($paths as $path) { diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php index d382d301f1..0cac70e0dc 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php +++ b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php @@ -190,14 +190,14 @@ class FtpJob extends AbstractJob if ($subdef == 'caption') { $desc = $app['serializer.caption']->serialize($record->get_caption(), CaptionSerializer::SERIALIZE_XML, $exportElement->isBusinessfields()); - $localfile = $app['root.path'] . '/tmp/' . md5($desc . time() . mt_rand()); + $localfile = sys_get_temp_dir().'/' . md5($desc . time() . mt_rand()); if (file_put_contents($localfile, $desc) === false) { throw new \Exception('Impossible de creer un fichier temporaire'); } } elseif ($subdef == 'caption-yaml') { $desc = $app['serializer.caption']->serialize($record->get_caption(), CaptionSerializer::SERIALIZE_YAML, $exportElement->isBusinessfields()); - $localfile = $app['root.path'] . '/tmp/' . md5($desc . time() . mt_rand()); + $localfile = sys_get_temp_dir().'/' . md5($desc . time() . mt_rand()); if (file_put_contents($localfile, $desc) === false) { throw new \Exception('Impossible de creer un fichier temporaire'); } @@ -272,7 +272,7 @@ class FtpJob extends AbstractJob $buffer .= $root . '/' . $folder . $filename . "\n"; } - $tmpfile = $app['root.path'] . '/tmp/tmpftpbuffer' . $date->format('U') . '.txt'; + $tmpfile = sys_get_temp_dir().'/tmpftpbuffer' . $date->format('U') . '.txt'; file_put_contents($tmpfile, $buffer); diff --git a/lib/Alchemy/Phrasea/Utilities/CachedTranslator.php b/lib/Alchemy/Phrasea/Utilities/CachedTranslator.php index 5fdd162322..fe1a42c2cf 100644 --- a/lib/Alchemy/Phrasea/Utilities/CachedTranslator.php +++ b/lib/Alchemy/Phrasea/Utilities/CachedTranslator.php @@ -45,11 +45,17 @@ class CachedTranslator extends Translator return; } - if (null === $this->options['cache_dir']) { + if (is_callable($this->options['cache_dir'])) { + $cache_dir = call_user_func($this->options['cache_dir'], $this->app); + } else { + $cache_dir = $this->options['cache_dir']; + } + + if (null === $cache_dir) { return parent::loadCatalogue($locale); } - $cache = new ConfigCache($this->options['cache_dir'].'/catalogue.'.$locale.'.php', $this->options['debug']); + $cache = new ConfigCache($cache_dir.'/catalogue.'.$locale.'.php', $this->options['debug']); if (!$cache->isFresh()) { parent::loadCatalogue($locale); diff --git a/lib/Alchemy/Phrasea/Utilities/CrossDomainDumper.php b/lib/Alchemy/Phrasea/Utilities/CrossDomainDumper.php new file mode 100644 index 0000000000..f14bd5e2c3 --- /dev/null +++ b/lib/Alchemy/Phrasea/Utilities/CrossDomainDumper.php @@ -0,0 +1,107 @@ +'.PHP_EOL; + $xml .= ''.PHP_EOL; + $xml .= '' . PHP_EOL; + $xml .= $this->getSiteControl($configuration); + $xml .= $this->getAllowAccess($configuration); + $xml .= $this->getAllowIdentity($configuration); + $xml .= $this->getAllowHeader($configuration); + $xml .= ""; + + return $xml; + } + + private function getSiteControl(array $conf) + { + $xml = ''; + + if (isset($conf['site-control'])) { + $xml = "\t".''.PHP_EOL; + } + + return $xml; + } + + private function getAllowAccess(array $conf) + { + $xml = ''; + if (!isset($conf['allow-access-from'])) { + return $xml; + } + $allowAccess = $conf['allow-access-from']; + if (!is_array($allowAccess)) { + return $xml; + } + + foreach ($allowAccess as $access) { + // domain is mandatory + if (!isset($access['domain'])) { + continue; + } + + $domain = $access['domain']; + $secure = isset($access['secure']) ? $access['secure'] : false; + $ports = isset($access['to-ports']) ? $access['to-ports'] : false; + + $xml .= "\t".''.PHP_EOL; + } + + return $xml; + } + + private function getAllowIdentity(array $conf) + { + $xml = ''; + if (!isset($conf['allow-access-from-identity'])) { + return $xml; + } + $allowAccess = $conf['allow-access-from-identity']; + if (!is_array($allowAccess)) { + return $xml; + } + foreach ($allowAccess as $access) { + $algorithm = isset($access['fingerprint-algorithm']) ? $access['fingerprint-algorithm'] : false; + $fingerprint = isset($access['fingerprint']) ? $access['fingerprint'] : false; + + // both are mandatory + if (!$algorithm || !$fingerprint) { + continue; + } + + $xml .= "\t".''.PHP_EOL; + } + + return $xml; + } + + private function getAllowHeader(array $conf) + { + $xml = ''; + if (!isset($conf['allow-http-request-headers-from'])) { + return $xml; + } + $allowHeaders = $conf['allow-http-request-headers-from']; + if (!is_array($allowHeaders)) { + return $xml; + } + foreach ($allowHeaders as $access) { + // domain & headers are mandatory + if (!isset($access['domain']) && !isset($access['headers'])) { + continue; + } + $secure = isset($access['secure']) ? $access['secure'] : false; + + $xml .= "\t".''.PHP_EOL; + } + + return $xml; + } +} diff --git a/lib/Alchemy/Phrasea/Utilities/CrossDomainParser.php b/lib/Alchemy/Phrasea/Utilities/CrossDomainParser.php new file mode 100644 index 0000000000..8bf775c4a0 --- /dev/null +++ b/lib/Alchemy/Phrasea/Utilities/CrossDomainParser.php @@ -0,0 +1,73 @@ +{"site-control"})) { + $sc = $xml->{"site-control"}; + foreach ($sc->attributes() as $k => $v) { + if ($k === 'permitted-cross-domain-policies') { + $conf['site-control'] = (string) $v; + } + } + } + if (isset($xml->{"allow-access-from"})) { + if (count($xml->{"allow-access-from"}) > 0) { + $conf['allow-access-from'] = array(); + foreach ($xml->{"allow-access-from"} as $el) { + $opt = array(); + foreach ($el->attributes() as $k => $v) { + $opt[$k] = (string) $v; + } + $conf['allow-access-from'][] = $opt; + } + } + } + if (isset($xml->{"signatory"})) { + if (count($xml->{"signatory"}) > 0) { + $conf['allow-access-from-identity'] = array(); + foreach ($xml->{"signatory"} as $el) { + if (isset($el->{"certificate"})) { + $c = array(); + foreach ($el->{"certificate"}->attributes() as $k => $v) { + $c[$k] = (string) $v; + } + $conf['allow-access-from-identity'][] = $c; + } + } + } + } + if (isset($xml->{"allow-http-request-headers-from"})) { + if (count($xml->{"allow-http-request-headers-from"}) > 0) { + $conf['allow-http-request-headers-from'] = array(); + foreach ($xml->{"allow-http-request-headers-from"} as $el) { + $opt = array(); + foreach ($el->attributes() as $k => $v) { + $opt[$k] = (string) $v; + } + $conf['allow-http-request-headers-from'][] = $opt; + } + } + } + + return $conf; + } +} diff --git a/lib/classes/Setup/Upgrade.php b/lib/classes/Setup/Upgrade.php index a65863cd2e..d796f9aece 100644 --- a/lib/classes/Setup/Upgrade.php +++ b/lib/classes/Setup/Upgrade.php @@ -17,9 +17,9 @@ class Setup_Upgrade { /** * - * @var appbox + * @var Applications */ - private $appbox; + private $app; /** * @@ -30,16 +30,16 @@ class Setup_Upgrade public function __construct(Application $app, $force = false) { if ($force) { - self::remove_lock_file(); + $this->remove_lock_file(); } - if (self::lock_exists()) { + if ($this->lock_exists()) { throw new Exception_Setup_UpgradeAlreadyStarted('The upgrade is already started'); } - $this->appbox = $app['phraseanet.appbox']; + $this->app = $app; - if (version_compare($this->appbox->get_version(), '3.9', '<') + if (version_compare($this->app['phraseanet.appbox']->get_version(), '3.9', '<') && count(MailChecker::getWrongEmailUsers($app)) > 0) { throw new \Exception_Setup_FixBadEmailAddresses('Please fix the database before starting'); } @@ -55,7 +55,7 @@ class Setup_Upgrade */ public function __destruct() { - self::remove_lock_file(); + $this->remove_lock_file(); return; } @@ -93,9 +93,9 @@ class Setup_Upgrade 'last_update' => $date_obj->format(DATE_ATOM), ], 1); - if (!file_put_contents(self::get_lock_file(), $datas)) + if (!file_put_contents($this->get_lock_file(), $datas)) throw new Exception_Setup_CannotWriteLockFile( - sprintf('Cannot write lock file to %s', self::get_lock_file()) + sprintf('Cannot write lock file to %s', $this->get_lock_file()) ); return $this; @@ -106,11 +106,11 @@ class Setup_Upgrade * * @return boolean */ - private static function lock_exists() + private function lock_exists() { clearstatcache(); - return file_exists(self::get_lock_file()); + return file_exists($this->get_lock_file()); } /** @@ -118,19 +118,19 @@ class Setup_Upgrade * * @return string */ - private static function get_lock_file() + private function get_lock_file() { - return __DIR__ . '/../../../tmp/upgrade.lock'; + return $this->app['tmp.path'].'/locks/upgrade.lock'; } /** * * @return Void */ - private static function remove_lock_file() + private function remove_lock_file() { - if (self::lock_exists()) { - unlink(self::get_lock_file()); + if ($this->lock_exists()) { + unlink($this->get_lock_file()); } return; diff --git a/lib/classes/appbox.php b/lib/classes/appbox.php index 7561d33c21..9fae1cbaf0 100644 --- a/lib/classes/appbox.php +++ b/lib/classes/appbox.php @@ -288,30 +288,33 @@ class appbox extends base $app['phraseanet.pre-schema-upgrader']->apply($app); $finder = new Finder(); - $finder->in([ - $this->app['root.path'] . '/tmp/cache_minify/', - $this->app['root.path'] . '/tmp/cache_twig/', - $this->app['root.path'] . '/tmp/translations/', - $this->app['root.path'] . '/tmp/cache/profiler/', - $this->app['root.path'] . '/tmp/doctrine/', - $this->app['root.path'] . '/tmp/serializer/', - ]) + $in = []; + foreach ($app['cache.paths'] as $path) { + $in[] = $path.'/minify/'; + $in[] = $path.'/twig/'; + $in[] = $path.'/translations/'; + $in[] = $path.'/profiler/'; + $in[] = $path.'/doctrine/'; + $in[] = $path.'/serializer/'; + }; + $finder->in(array_filter($in, function($path) { + return is_dir($path); + })) ->depth(0) ->ignoreVCS(true) ->ignoreDotFiles(true); - foreach ($finder as $file) { - $app['filesystem']->remove($file); - } + + $app['filesystem']->remove($finder); foreach ([ - 'config/custom_files/' => 'www/custom/', - 'config/minilogos/' => 'www/custom/minilogos/', - 'config/stamp/' => 'www/custom/stamp/', - 'config/status/' => 'www/custom/status/', - 'config/wm/' => 'www/custom/wm/', + 'config/custom_files/' => 'www/custom/', + 'config/minilogos/' => 'www/custom/minilogos/', + 'config/stamp/' => 'www/custom/stamp/', + 'config/status/' => 'www/custom/status/', + 'config/wm/' => 'www/custom/wm/', ] as $source => $target) { - $app['filesystem']->mirror($this->app['root.path'] . '/' . $source, $this->app['root.path'] . '/' . $target); + $app['filesystem']->mirror($this->app['root.path'] . '/' . $source, $this->app['root.path'] . '/' . $target, null, array('override' => true)); } $advices = $this->upgradeDB(true, $app); diff --git a/lib/classes/base.php b/lib/classes/base.php index 094c9c3075..771ab8cd85 100644 --- a/lib/classes/base.php +++ b/lib/classes/base.php @@ -412,7 +412,7 @@ abstract class base implements cache_cacheableInterface { $field_stmt = $defaults_stmt = []; - $create_stmt = "CREATE TABLE `" . $table['name'] . "` ("; + $create_stmt = "CREATE TABLE IF NOT EXISTS `" . $table['name'] . "` ("; foreach ($table->fields->field as $field) { $isnull = trim($field->null) == "" ? "NOT NULL" : "NULL"; diff --git a/lib/classes/connection/pdoStatement.php b/lib/classes/connection/pdoStatement.php new file mode 100644 index 0000000000..7386c54837 --- /dev/null +++ b/lib/classes/connection/pdoStatement.php @@ -0,0 +1,37 @@ +statement = $statement; + + return $this; + } + + public function getQueryString() + { + return $this->statement->queryString; + } + + public function execute($params = array()) + { + return $this->statement->execute($params); + } + + public function __call($function_name, $parameters) + { + return call_user_func_array(array($this->statement, $function_name), $parameters); + } +} diff --git a/lib/classes/connection/pdoStatementReconnectable.php b/lib/classes/connection/pdoStatementReconnectable.php new file mode 100644 index 0000000000..4216d55af1 --- /dev/null +++ b/lib/classes/connection/pdoStatementReconnectable.php @@ -0,0 +1,52 @@ +statement = $statement; + $this->conn = $conn; + + return $this; + } + + public function getQueryString() + { + return $this->statement->getQueryString(); + } + + public function execute($params = array()) + { + try { + return $this->statement->execute($params); + } catch (\Exception $e) { + $unreachable = ($e->getCode() === 2006) || (false !== strpos($e->getMessage(), 'MySQL server has gone away')) || (false !== strpos($e->getMessage(), 'errno=32 Broken pipe')); + if (!$unreachable) { + throw $e; + } + $this->conn->connect(); + } + // retry query with update statement + $this->statement = $this->conn->prepare($this->getQueryString()); + + return $this->statement->execute($params); + } + + public function __call($function_name, $parameters) + { + return call_user_func_array(array($this->statement, $function_name), $parameters); + } +} diff --git a/lib/classes/connection/statement.php b/lib/classes/connection/statement.php new file mode 100644 index 0000000000..12317cf259 --- /dev/null +++ b/lib/classes/connection/statement.php @@ -0,0 +1,16 @@ +get_connection()->prepare($sql); $stmt->execute(); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $stmt->closeCursor(); - $ret = ['xml_indexed' => 0, 'thesaurus_indexed' => 0]; + $ret = array( + 'xml_indexed' => 0, + 'thesaurus_indexed' => 0, + 'jeton_subdef' => array() + ); + foreach ($rs as $row) { $status = $row['status']; if ($status & 1) @@ -435,6 +439,21 @@ class databox extends base $ret['thesaurus_indexed'] += $row['n']; } + $sql = "SELECT type, jeton, COUNT(record_id) AS n FROM record WHERE jeton & ".JETON_MAKE_SUBDEF." GROUP BY type, jeton"; + $stmt = $this->get_connection()->prepare($sql); + $stmt->execute(); + $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); + $stmt->closeCursor(); + + foreach ($rs as $row) { + if(!array_key_exists($row['type'], $ret['jeton_subdef'])) { + $ret['jeton_subdef'][$row['type']] = 0; + } + if((int)$row['jeton'] & JETON_MAKE_SUBDEF) { + $ret['jeton_subdef'][$row['type']] += (int)$row['n']; + } + } + return $ret; } @@ -575,7 +594,7 @@ class databox extends base $databox = $app['phraseanet.appbox']->get_databox($sbas_id); $databox->insert_datas(); $databox->setNewStructure( - $data_template, $app['conf']->get(['main', 'storage', 'subdefs', 'default-dir']) + $data_template, $app['conf']->get(['main', 'storage', 'subdefs']) ); return $databox; @@ -915,7 +934,7 @@ class databox extends base $contents = str_replace( ["{{basename}}", "{{datapathnoweb}}"] - , [$this->dbname, $path_doc] + , [$this->dbname, rtrim($path_doc, '/').'/'] , $contents ); diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.php b/lib/classes/module/console/sphinxGenerateSuggestion.php index a5fa5e435c..5453d8a994 100644 --- a/lib/classes/module/console/sphinxGenerateSuggestion.php +++ b/lib/classes/module/console/sphinxGenerateSuggestion.php @@ -42,7 +42,7 @@ class module_console_sphinxGenerateSuggestion extends Command ) )); - $tmp_file = $this->container['root.path'] . '/tmp/dict' . $index . '.txt'; + $tmp_file = sys_get_temp_dir().'/dict' . $index . '.txt'; $databox = $this->getService('phraseanet.appbox')->get_databox($sbas_id); diff --git a/lib/classes/module/console/systemClearCache.php b/lib/classes/module/console/systemClearCache.php index 7b670a2bbc..5950053f75 100644 --- a/lib/classes/module/console/systemClearCache.php +++ b/lib/classes/module/console/systemClearCache.php @@ -31,21 +31,16 @@ class module_console_systemClearCache extends Command { $finder = new Finder(); + $in = []; + foreach ($this->container['cache.paths'] as $path) { + $in[] = $path; + }; $finder ->exclude('.git') ->exclude('.svn') - ->in([ - $this->container['root.path'] . '/tmp/cache_minify/', - $this->container['root.path'] . '/tmp/cache_twig/', - $this->container['root.path'] . '/tmp/translations/', - $this->container['root.path'] . '/tmp/cache/profiler/', - $this->container['root.path'] . '/tmp/doctrine/', - $this->container['root.path'] . '/tmp/serializer/', - ]); + ->in($in); - $filesystem = new Filesystem(); - - $filesystem->remove($finder); + $this->container['filesystem']->remove($finder); if ($this->container['phraseanet.configuration-tester']->isInstalled()) { $this->getService('phraseanet.cache-service')->flushAll(); diff --git a/lib/classes/module/report/activity.php b/lib/classes/module/report/activity.php index dffa49eee6..542e52d2fe 100644 --- a/lib/classes/module/report/activity.php +++ b/lib/classes/module/report/activity.php @@ -641,8 +641,9 @@ class module_report_activity extends module_report INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id) WHERE log.site = :site_id AND log_date.action = 'download' - AND (" . $datefilter['sql'] . ") - AND (" . $collfilter['sql'] . ") + AND (" . $datefilter['sql'] . ")" . + (('' !== $collfilter['sql']) ? "AND (" . $collfilter['sql'] . ")" : '') + . " ) AS tt LEFT JOIN subdef AS s ON (s.record_id = tt.record_id) WHERE s.name = tt.final @@ -715,9 +716,9 @@ class module_report_activity extends module_report SELECT DISTINCT(log_date.id), log_date.date AS heures FROM log AS log_date FORCE INDEX (date_site) INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id) - WHERE " . $datefilter['sql'] . " - AND " . $collfilter['sql'] . " - AND log_date.site = :site_id + WHERE " . $datefilter['sql'] . "" . + (('' !== $collfilter['sql']) ? "AND (" . $collfilter['sql'] . ")" : '') + . " AND log_date.site = :site_id ) AS tt"; $stmt = $conn->prepare($sql); @@ -747,12 +748,10 @@ class module_report_activity extends module_report { $databox = $app['phraseanet.appbox']->get_databox($sbas_id); $conn = $databox->get_connection(); - $result = []; - $res = []; - $datefilter = - module_report_sqlfilter::constructDateFilter($dmin, $dmax); - $collfilter = - module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id); + $result = array(); + $res = array(); + $datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax); + $collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id); $params = [':site_id' => $app['conf']->get(['main', 'key'])]; $params = array_merge($params, $datefilter['params'], $collfilter['params']); @@ -763,9 +762,9 @@ class module_report_activity extends module_report SELECT DISTINCT(log_date.id), DATE_FORMAT( log_date.date, '%Y-%m-%d' ) AS ddate FROM log AS log_date FORCE INDEX (date_site) INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id) WHERE " . $datefilter['sql'] . " - AND log_date.site = :site_id - AND (" . $collfilter['sql'] . ") - ) AS tt + AND log_date.site = :site_id" . + (('' !== $collfilter['sql']) ? (" AND (" . $collfilter['sql'] . ")") : '') + . ") AS tt GROUP by tt.ddate ORDER BY tt.ddate ASC"; @@ -807,9 +806,9 @@ class module_report_activity extends module_report INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_search.log_id = log_date.id) INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id) WHERE " . $datefilter['sql'] . " - AND log_date.site = :site_id - AND (" . $collfilter['sql'] . ") - ) AS tt + AND log_date.site = :site_id" . + (('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '') + . ") AS tt GROUP BY tt.usrid ORDER BY nb DESC"; @@ -848,9 +847,9 @@ class module_report_activity extends module_report INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_search.log_id = log_date.id) INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id) WHERE " . $datefilter['sql'] . " - AND log_date.site = :site_id - AND (" . $collfilter['sql'] . ") - ) AS tt + AND log_date.site = :site_id" . + (('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '') + . ") AS tt GROUP BY tt.search ORDER BY nb DESC"; @@ -889,9 +888,9 @@ class module_report_activity extends module_report FROM (log_view) INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_view.log_id = log_date.id) INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id) - WHERE " . $datefilter['sql'] . " - AND (" . $collfilter['sql'] . ") - ) AS tt + WHERE " . $datefilter['sql'] . "" . + (('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '') + . ") AS tt GROUP BY referrer ORDER BY nb_view DESC "; @@ -933,8 +932,9 @@ class module_report_activity extends module_report FROM (log_docs AS log_date) INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id) INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id) - WHERE " . $datefilter['sql'] . " AND log_date.action = 'add' - AND (" . $collfilter['sql'] . ") + WHERE " . $datefilter['sql'] . " AND log_date.action = 'add' " . + (('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '') + . " ) AS tt GROUP BY tt.ddate ORDER BY activity ASC "; @@ -969,9 +969,9 @@ class module_report_activity extends module_report FROM (log_docs AS log_date) INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id) INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id) - WHERE " . $datefilter['sql'] . " AND log_date.action = 'edit' - AND (" . $collfilter['sql'] . ") - ) AS tt + WHERE " . $datefilter['sql'] . " AND log_date.action = 'edit'" . + (('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '') + . ") AS tt GROUP BY tt.ddate ORDER BY activity ASC "; @@ -1006,9 +1006,9 @@ class module_report_activity extends module_report FROM (log_docs AS log_date) INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id) INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id) - WHERE " . $datefilter['sql'] . " AND log_date.action = 'add' - AND (" . $collfilter['sql'] . ") - ) AS tt + WHERE " . $datefilter['sql'] . " AND log_date.action = 'add'" . + (('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '') + . ") AS tt GROUP BY tt.usrid ORDER BY nb ASC "; diff --git a/lib/classes/module/report/sqlfilter.php b/lib/classes/module/report/sqlfilter.php index 00f287b8c0..fef31471f7 100644 --- a/lib/classes/module/report/sqlfilter.php +++ b/lib/classes/module/report/sqlfilter.php @@ -50,7 +50,11 @@ class module_report_sqlfilter $coll_filter[] = 'log_colls.coll_id = ' . $val; } } - $ret['sql'] = ' (' . implode(' OR ', array_unique($coll_filter)) . ') '; + $collections = array_unique($coll_filter); + + if (count($collections) > 0) { + $ret['sql'] = ' (' . implode(' OR ', $collections) . ') '; + } return $ret; } @@ -66,15 +70,15 @@ class module_report_sqlfilter $params = [':log_site' => $this->app['conf']->get(['main', 'key'])]; - if ($this->filter['date']) { + if ($this->filter['date'] && $this->filter['date']['sql'] !== '') { $finalfilter .= $this->filter['date']['sql'] . ' AND '; $params = array_merge($params, $this->filter['date']['params']); } - if ($this->filter['user']) { + if ($this->filter['user'] && $this->filter['user']['sql'] !== '') { $finalfilter .= $this->filter['user']['sql'] . ' AND '; $params = array_merge($params, $this->filter['user']['params']); } - if ($this->filter['collection']) { + if ($this->filter['collection'] && $this->filter['collection']['sql'] !== '') { $finalfilter .= $this->filter['collection']['sql'] . ' AND '; $params = array_merge($params, $this->filter['collection']['params']); } @@ -174,9 +178,12 @@ class module_report_sqlfilter $n ++; } - $filter_user = ['sql' => implode(' AND ', $filter), 'params' => $params]; - $this->filter['user'] = $filter_user; + if (count($filter) > 0) { + $filter_user = array('sql' => implode(' AND ', $filter), 'params' => $params); + $this->filter['user'] = $filter_user; + } + } return; @@ -201,7 +208,11 @@ class module_report_sqlfilter } } - $this->filter['collection'] = ['sql' => ' (' . implode(' OR ', array_unique($coll_filter)) . ') ', 'params' => []]; + $collections = array_unique($coll_filter); + + if (count($collections) > 0) { + $this->filter['collection'] = array('sql' => ' (' . implode(' OR ', array_unique($coll_filter)) . ') ', 'params' => array()); + } } return; @@ -219,7 +230,9 @@ class module_report_sqlfilter $params[":record_fil" . $n] = phrasea::collFromBas($this->app, $val); $n ++; } - $this->filter['record'] = ['sql' => implode(' OR ', $dl_coll_filter), 'params' => $params]; + if (count($dl_coll_filter) > 0) { + $this->filter['record'] = array('sql' => implode(' OR ', $dl_coll_filter), 'params' => $params); + } } return; diff --git a/lib/classes/patch/370alpha7a.php b/lib/classes/patch/370alpha7a.php index 28adca9436..89515dd2e7 100644 --- a/lib/classes/patch/370alpha7a.php +++ b/lib/classes/patch/370alpha7a.php @@ -89,7 +89,7 @@ class patch_370alpha7a extends patchAbstract $i = 0; foreach ($rs as $row) { - $filePath = $app['root.path'] . '/tmp/lazaret/' . $row['filepath']; + $filePath = $app['tmp.lazaret.path'].'/'.$row['filepath']; if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) { continue; } @@ -100,7 +100,7 @@ class patch_370alpha7a extends patchAbstract $spec->setResizeMode(ImageSpec::RESIZE_MODE_INBOUND_FIXEDRATIO); $spec->setDimensions(375, 275); - $thumbPath = $app['root.path'] . '/tmp/lazaret/' . sprintf("thumb_%s", $row['filepath']); + $thumbPath = $app['tmp.lazaret.path'].'/'.sprintf("thumb_%s", $row['filepath']); try { $app['media-alchemyst']->turnInto($filePath, $thumbPath, $spec); diff --git a/lib/classes/patch/380alpha16a.php b/lib/classes/patch/380alpha16a.php index 3570f9faa1..dd1d40be12 100644 --- a/lib/classes/patch/380alpha16a.php +++ b/lib/classes/patch/380alpha16a.php @@ -63,11 +63,11 @@ class patch_380alpha16a extends patchAbstract } $xsendfile['mapping'][] = [ - 'directory' => $app['root.path'] . '/tmp/lazaret/', + 'directory' => $app['tmp.lazaret.path'], 'mount-point' => '/lazaret/', ]; $xsendfile['mapping'][] = [ - 'directory' => $app['root.path'] . '/tmp/download/', + 'directory' => $app['tmp.download.path'], 'mount-point' => '/download/', ]; diff --git a/lib/classes/patch/386alpha2a.php b/lib/classes/patch/386alpha2a.php new file mode 100644 index 0000000000..151c90983a --- /dev/null +++ b/lib/classes/patch/386alpha2a.php @@ -0,0 +1,85 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * Returns doctrine migrations needed for the patch. + * + * @return array + */ + public function getDoctrineMigrations() + { + return array(); + } + + /** + * {@inheritdoc} + */ + public function apply(base $appbox, Application $app) + { + $config = $app['phraseanet.configuration']->getConfig(); + + $parser = new CrossDomainParser(); + try { + $crossDomainConfig = $parser->parse($app['root.path'].'/www/crossdomain.xml'); + } catch (RuntimeException $e) { + $crossDomainConfig = array( + 'allow-access-from' => array( + array( + 'domain' => '*.cooliris.com', + 'secure' => 'false', + ) + ) + ); + } + + $config['crossdomain'] = $crossDomainConfig; + + $app['phraseanet.configuration']->setConfig($config); + + return true; + } +} diff --git a/lib/classes/patch/390alpha19a.php b/lib/classes/patch/390alpha19a.php new file mode 100644 index 0000000000..a4ad1f1eac --- /dev/null +++ b/lib/classes/patch/390alpha19a.php @@ -0,0 +1,100 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function getDoctrineMigrations() + { + return []; + } + + /** + * {@inheritdoc} + */ + public function apply(base $appbox, Application $app) + { + $storage = $app['conf']->get(['main', 'storage']); + $storage['cache'] = $app['root.path'].'/cache'; + $storage['log'] = $app['root.path'].'/logs'; + $storage['download'] = $app['root.path'].'/tmp/download'; + $storage['lazaret'] = $app['root.path'].'/tmp/lazaret'; + $storage['caption'] = $app['root.path'].'/tmp/caption'; + $app['conf']->set(['main', 'storage'], $storage); + + // update file structure + $this->removeDirectory($app, $app['root.path'].'/tmp/cache_twig'); + $this->removeDirectory($app, $app['root.path'].'/tmp/doctrine'); + $this->removeDirectory($app, $app['root.path'].'/tmp/profiler'); + $this->removeDirectory($app, $app['root.path'].'/tmp/serializer'); + $this->removeDirectory($app, $app['root.path'].'/tmp/translations'); + $this->removeDirectory($app, $app['root.path'].'/tmp/cache_minify'); + $this->removeDirectory($app, $app['root.path'].'/features'); + $this->removeDirectory($app, $app['root.path'].'/hudson'); + $this->removeDirectory($app, $app['root.path'].'/locales'); + $this->removeDirectory($app, $app['root.path'].'/vagrant'); + $this->removeDirectory($app, $app['root.path'].'/tmp/doctrine-proxies'); + + + $this->copyFile($app, $app['root.path'].'/tmp/cache_registry.php', $app['cache.path'].'/cache_registry.php'); + $this->copyFile($app, $app['root.path'].'/tmp/configuration-compiled.php', $app['root.path'].'/config/configuration-compiled.php'); + + return true; + } + + private function removeDirectory(Application $app, $originDir) + { + if (is_dir($originDir)) { + $app['filesystem']->remove($originDir); + } + } + + private function copyFile(Application $app, $originFile, $targetFile) + { + if ($app['filesystem']->exists($originFile)) { + $app['filesystem']->copy($originFile, $targetFile); + } + } +} diff --git a/lib/classes/patch/390alpha9b.php b/lib/classes/patch/390alpha9b.php index 58856fda34..978a3a483a 100644 --- a/lib/classes/patch/390alpha9b.php +++ b/lib/classes/patch/390alpha9b.php @@ -165,7 +165,7 @@ class patch_390alpha9b extends patchAbstract 'GV_smtp_secure' => ['registry', 'email', 'smtp-secure-mode'], 'GV_smtp_user' => ['registry', 'email', 'smtp-user'], 'GV_smtp_password' => ['registry', 'email', 'smtp-password'], - 'GV_base_datapath_noweb' => ['main', 'storage', 'subdefs', 'default-dir'], + 'GV_base_datapath_noweb' => ['main', 'storage', 'subdefs'], 'GV_youtube_api' => ['main', 'bridge', 'youtube', 'enabled'], 'GV_youtube_client_id' => ['main', 'bridge', 'youtube', 'client_id'], 'GV_youtube_client_secret' => ['main', 'bridge', 'youtube', 'client_secret'], diff --git a/lib/classes/random.php b/lib/classes/random.php index 07a0980a88..9b6ea4fa29 100644 --- a/lib/classes/random.php +++ b/lib/classes/random.php @@ -41,7 +41,7 @@ class random switch ($row['type']) { case 'download': case 'email': - $file = $this->app['root.path'] . '/tmp/download/' . $row['value'] . '.zip'; + $file = $this->app['tmp.download.path'].'/'.$row['value'].'.zip'; if (is_file($file)) unlink($file); break; diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php index 1ba6a71f33..6ba4432a2f 100644 --- a/lib/classes/set/export.php +++ b/lib/classes/set/export.php @@ -631,8 +631,7 @@ class set_export extends set_abstract $files[$id]["export_name"] = $tmp_name; if (in_array('caption', $subdefs)) { - $caption_dir = $this->app['root.path'] . '/tmp/desc_tmp/' - . time() . $this->app['authentication']->getUser()->getId() . '/'; + $caption_dir = $this->app['tmp.caption.path'].'/'.time().$this->app['authentication']->getUser()->getId().'/'; $filesystem->mkdir($caption_dir, 0750); @@ -653,8 +652,7 @@ class set_export extends set_abstract } if (in_array('caption-yaml', $subdefs)) { - $caption_dir = $this->app['root.path'] . '/tmp/desc_tmp/' - . time() . $this->app['authentication']->getUser()->getId() . '/'; + $caption_dir = $this->app['tmp.caption.path'].'/'.time().$this->app['authentication']->getUser()->getId().'/'; $filesystem->mkdir($caption_dir, 0750); diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index f1ad2be4f4..f87ffc59ba 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -2350,14 +2350,22 @@ - - completed - tinyint(4) - - - -1 - - + + todo + int(11) + + + 0 + + + + done + int(11) + + + 0 + + runner char(20) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 62be55a741..355ae28797 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -72,8 +72,12 @@ main: swftools_timeout: 60 unoconv_timeout: 60 storage: - subdefs: - default-dir: null + subdefs: null + cache: null + log : null + download: null + lazaret: null + caption: null bridge: youtube: enabled: false @@ -199,3 +203,8 @@ session: idle: 0 # 1 week lifetime: 604800 +crossdomain: + allow-access-from: + - + domain: '*.cooliris.com' + secure: 'false' diff --git a/logs/.gitignore b/logs/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/logs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/logs/.gitkeep b/logs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/Fixtures/exampleImportUsers.csv b/resources/examples/example_import_users.csv similarity index 100% rename from lib/Fixtures/exampleImportUsers.csv rename to resources/examples/example_import_users.csv diff --git a/lib/Fixtures/Fields.rtf b/resources/examples/fields.rtf similarity index 100% rename from lib/Fixtures/Fields.rtf rename to resources/examples/fields.rtf diff --git a/config/personnalisation_sample/topics (sample).xml b/resources/examples/topics_sample.xml similarity index 100% rename from config/personnalisation_sample/topics (sample).xml rename to resources/examples/topics_sample.xml diff --git a/features/bootstrap/FeatureContext.php b/resources/features/bootstrap/FeatureContext.php similarity index 100% rename from features/bootstrap/FeatureContext.php rename to resources/features/bootstrap/FeatureContext.php diff --git a/features/bootstrap/GuiContext.php b/resources/features/bootstrap/GuiContext.php similarity index 100% rename from features/bootstrap/GuiContext.php rename to resources/features/bootstrap/GuiContext.php diff --git a/features/login/change_password.feature b/resources/features/login/change_password.feature similarity index 100% rename from features/login/change_password.feature rename to resources/features/login/change_password.feature diff --git a/features/login/forgot_password.feature b/resources/features/login/forgot_password.feature similarity index 100% rename from features/login/forgot_password.feature rename to resources/features/login/forgot_password.feature diff --git a/features/login/guest_access.feature b/resources/features/login/guest_access.feature similarity index 100% rename from features/login/guest_access.feature rename to resources/features/login/guest_access.feature diff --git a/features/login/locale.feature b/resources/features/login/locale.feature similarity index 100% rename from features/login/locale.feature rename to resources/features/login/locale.feature diff --git a/features/login/login.feature b/resources/features/login/login.feature similarity index 100% rename from features/login/login.feature rename to resources/features/login/login.feature diff --git a/features/login/register.feature b/resources/features/login/register.feature similarity index 100% rename from features/login/register.feature rename to resources/features/login/register.feature diff --git a/hudson/InstallDBs.yml b/resources/hudson/InstallDBs.yml similarity index 100% rename from hudson/InstallDBs.yml rename to resources/hudson/InstallDBs.yml diff --git a/hudson/_GV.php b/resources/hudson/_GV.php similarity index 100% rename from hudson/_GV.php rename to resources/hudson/_GV.php diff --git a/hudson/ant.xml b/resources/hudson/ant.xml similarity index 94% rename from hudson/ant.xml rename to resources/hudson/ant.xml index deb47cf7d4..44563e47b1 100644 --- a/hudson/ant.xml +++ b/resources/hudson/ant.xml @@ -1,5 +1,5 @@ - + diff --git a/hudson/build.properties b/resources/hudson/build.properties similarity index 100% rename from hudson/build.properties rename to resources/hudson/build.properties diff --git a/hudson/cleanupSubdefs.php b/resources/hudson/cleanupSubdefs.php similarity index 77% rename from hudson/cleanupSubdefs.php rename to resources/hudson/cleanupSubdefs.php index ca0c55444e..17592f444f 100644 --- a/hudson/cleanupSubdefs.php +++ b/resources/hudson/cleanupSubdefs.php @@ -1,8 +1,8 @@ get_databoxes() as $databox) { $structure = $databox->get_subdef_structure(); diff --git a/hudson/config.json b/resources/hudson/config.json similarity index 100% rename from hudson/config.json rename to resources/hudson/config.json diff --git a/hudson/connexion.inc b/resources/hudson/connexion.inc similarity index 100% rename from hudson/connexion.inc rename to resources/hudson/connexion.inc diff --git a/hudson/fixtures.sql b/resources/hudson/fixtures.sql similarity index 100% rename from hudson/fixtures.sql rename to resources/hudson/fixtures.sql diff --git a/hudson/run-qunit.js b/resources/hudson/run-qunit.js similarity index 100% rename from hudson/run-qunit.js rename to resources/hudson/run-qunit.js diff --git a/hudson/testJS.sh b/resources/hudson/testJS.sh similarity index 100% rename from hudson/testJS.sh rename to resources/hudson/testJS.sh diff --git a/resources/proxies/.gitkeep b/resources/proxies/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vagrant/config/nginx/php5-fpm-www.conf b/resources/vagrant/config/nginx/php5-fpm-www.conf similarity index 100% rename from vagrant/config/nginx/php5-fpm-www.conf rename to resources/vagrant/config/nginx/php5-fpm-www.conf diff --git a/resources/vagrant/config/phraseanet/configuration.yml b/resources/vagrant/config/phraseanet/configuration.yml new file mode 100644 index 0000000000..826d002bb1 --- /dev/null +++ b/resources/vagrant/config/phraseanet/configuration.yml @@ -0,0 +1,210 @@ +servername: 'http://local.phrasea/' +languages: + available: [] + default: 'fr' +main: + maintenance: false + key: '' + database: + host: 'sql-host' + port: 3306 + user: 'sql-user' + password: 'sql-password' + dbname: ab_phraseanet + driver: pdo_mysql + charset: UTF8 + database-test: + driver: pdo_sqlite + path: '/tmp/db.sqlite' + charset: UTF8 + cache: + type: ArrayCache + options: [] + opcodecache: + type: ArrayCache + options: [] + search-engine: + type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine + options: [] + task-manager: + status: started + enabled: true + logger: + max-files: 10 + enabled: true + level: INFO + listener: + protocol: tcp + host: 127.0.0.1 + port: 6660 + linger: 500 + websocket-server: + host: local.phrasea + port: 9090 + ip: 0.0.0.0 + subscriber: + protocol: tcp + host: 127.0.0.1 + port: 13598 + session: + type: 'redis' + options: + host: localhost + port: 6379 + ttl: 86400 + binaries: + ghostscript_binary: null + php_binary: null + swf_extract_binary: null + pdf2swf_binary: null + swf_render_binary: null + unoconv_binary: null + ffmpeg_binary: null + ffprobe_binary: null + mp4box_binary: null + pdftotext_binary: null + recess_binary: null + phraseanet_indexer: null + ffmpeg_timeout: 3600 + ffprobe_timeout: 60 + gs_timeout: 60 + mp4box_timeout: 60 + swftools_timeout: 60 + unoconv_timeout: 60 + storage: + subdefs: null + cache: /tmp/phraseanet/cache + log : /tmp/phraseanet/log + download: /var/www/phraseanet/tmp/download + lazaret: /var/www/phraseanet/tmp/lazaret + caption: /var/www/phraseanet/tmp/caption + bridge: + youtube: + enabled: false + client_id: null + client_secret: null + developer_key: null + flickr: + enabled: false + client_id: null + client_secret: null + dailymotion: + enabled: false + client_id: null + client_secret: null +trusted-proxies: ['127.0.0.1'] +debugger: + allowed-ips: ['192.168.56.1'] +border-manager: + enabled: true + extension-mapping: { } + checkers: + - + type: Checker\Sha256 + enabled: true + - + type: Checker\UUID + enabled: true + - + type: Checker\Colorspace + enabled: false + options: + colorspaces: [cmyk, grayscale, rgb] + - + type: Checker\Dimension + enabled: false + options: + width: 80 + height: 160 + - + type: Checker\Extension + enabled: false + options: + extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2] + - + type: Checker\Filename + enabled: false + options: + sensitive: true + - + type: Checker\MediaType + enabled: false + options: + mediatypes: [Audio, Document, Flash, Image, Video] +authentication: + auto-create: + templates: { } + captcha: + enabled: true + trials-before-display: 9 + providers: + facebook: + enabled: false + options: + app-id: '' + secret: '' + twitter: + enabled: false + options: + consumer-key: '' + consumer-secret: '' + google-plus: + enabled: false + options: + client-id: '' + client-secret: '' + github: + enabled: false + options: + client-id: '' + client-secret: '' + viadeo: + enabled: false + options: + client-id: '' + client-secret: '' + linkedin: + enabled: false + options: + client-id: '' + client-secret: '' +registration-fields: + - + name: company + required: true + - + name: lastname + required: true + - + name: firstname + required: true + - + name: geonameid + required: true +xsendfile: + enabled: false + type: nginx + mapping: [] +h264-pseudo-streaming: + enabled: false + type: nginx + mapping: [] +plugins: [] +api_cors: + enabled: false + allow_credentials: false + allow_origin: [] + allow_headers: [] + allow_methods: [] + expose_headers: [] + max_age: 0 + hosts: [] +session: + idle: 0 + # 1 week + lifetime: 604800 +crossdomain: + allow-access-from: + - + domain: '*.cooliris.com' + secure: 'false' diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/.gitattributes b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/.gitattributes similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/.gitattributes rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/.gitattributes diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml similarity index 93% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml index e288891824..bae47fc8ff 100644 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml @@ -26,12 +26,12 @@ vagrantfile-local: cpus: 1 provision: puppet: - manifests_path: vagrant/vms/phraseanet-php54-nginx/puphpet/puppet + manifests_path: resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet manifest_file: manifest.pp - module_path: vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules + module_path: resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules options: - '--verbose' - - '--hiera_config /vagrant/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml' + - '--hiera_config /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml' - '--parser future' synced_folder: KaPfJ4CzfgFk: @@ -150,12 +150,11 @@ nginx: proxy_buffers: '4 256k' vhosts: issDOx17O4bn: - server_name: nginx.phraseanet + server_name: phraseanet-php54-nginx server_aliases: - - nginx.phrasea.net - - nginx.alchemyasp.com + - nginx.phraseanet.php54 www_root: /var/www/phraseanet/www - listen_port: '8080' + listen_port: '80' index_files: - index.html - index.htm diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_aliases b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_aliases similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_aliases rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_aliases diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_git b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_git similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_git rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.bash_git diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.vimrc b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.vimrc similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.vimrc rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.vimrc diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore new file mode 100644 index 0000000000..b1394f8ce6 --- /dev/null +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!insecure_private_key diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/insecure_private_key b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/insecure_private_key similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/insecure_private_key rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/insecure_private_key diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/.gitkeep b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup similarity index 64% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup index 33b4febd88..5188d5180c 100755 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup @@ -9,14 +9,6 @@ sudo iptables -I INPUT -p tcp --dport 9200 -j ACCEPT # open mysql ports sudo iptables -I INPUT -p tcp --dport 3306 -j ACCEPT -#closure -echo 'export JS_COMPILER=$HOME/closure/compiler.jar' >> ~/.bashrc -source ~/.bashrc - -# java -echo 'export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre/' >> ~/.bashrc -source ~/.bashrc - # locales export LANGUAGE=fr_FR.UTF-8 diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/.gitkeep b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup similarity index 70% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup index 1265fe50e0..4978d42fce 100644 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup @@ -5,7 +5,6 @@ sudo sh -c 'echo "Europe/Paris" > /etc/timezone' sudo dpkg-reconfigure -f noninteractive tzdata # locales - export LANGUAGE=fr_FR.UTF-8 export LANG=fr_FR.UTF-8 export LC_ALL=fr_FR.UTF-8 @@ -31,14 +30,19 @@ sudo npm install -g grunt-cli sudo npm install -g bower # python tools - sudo easy_install -U taschenmesser scour boto # closure compiler cd /tmp wget –quiet http://dl.google.com/closure-compiler/compiler-latest.zip unzip compiler-latest.zip -d closure -mv closure $HOME +mv /tmp/closure /home/vagrant +sudo sh -c "echo 'JS_COMPILER=/home/vagrant/closure/compiler.jar' >> /etc/environment" +export JS_COMPILER=/home/vagrant/closure/compiler.jar + +# java +sudo sh -c "echo 'JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre/' >> /etc/environment" +export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre/ #twig cd /tmp @@ -102,7 +106,25 @@ fi sudo sh -c 'echo "RUN=yes" > /etc/default/cachefilesd' # copy www.conf -sudo sh -c "cat /vagrant/vagrant/config/nginx/php5-fpm-www.conf > /etc/php5/fpm/pool.d/www.conf" +sudo sh -c "cat /vagrant/resources/vagrant/config/nginx/php5-fpm-www.conf > /etc/php5/fpm/pool.d/www.conf" -# restart mysql to get new date system +#setup phraseanet +if [ ! -f /var/www/phraseanet/config/configuration.yml ] +then + #copy configuration template + mv /var/www/phraseanet/lib/conf.d/configuration.yml /var/www/phraseanet/lib/conf.d/configuration.yml.bkp + cp /vagrant/resources/vagrant/config/phraseanet/configuration.yml /var/www/phraseanet/lib/conf.d/configuration.yml + cd /var/www/phraseanet + composer install -n --prefer-source --dev + npm install + grunt install-assets + bin/developer assets:compile-less + rm -f /var/www/phraseanet/lib/conf.d/configuration.yml + mv /var/www/phraseanet/lib/conf.d/configuration.yml.bkp /var/www/phraseanet/lib/conf.d/configuration.yml +fi + +# restart services sudo service mysql restart +sudo service php5-fpm restart +sudo service nginx restart + diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-always/.gitkeep b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-always/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-once/.gitkeep b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/startup-once/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/Puppetfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/Puppetfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/Puppetfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/Puppetfile diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml new file mode 100644 index 0000000000..99bde24b12 --- /dev/null +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml @@ -0,0 +1,7 @@ +--- +:backends: yaml +:yaml: + :datadir: '/vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet' +:hierarchy: + - config +:logger: console diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp similarity index 99% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp index 9b15bc3bb8..8ddc804dd7 100644 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp @@ -40,10 +40,10 @@ file { "/home/${::ssh_username}": # copy dot files to ssh user's home directory exec { 'dotfiles': cwd => "/home/${::ssh_username}", - command => "cp -r /vagrant/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /home/${::ssh_username}/ \ + command => "cp -r /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /home/${::ssh_username}/ \ && chown -R ${::ssh_username} /home/${::ssh_username}/.[a-zA-Z0-9]* \ - && cp -r /vagrant/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /root/", - onlyif => 'test -d /vagrant/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot', + && cp -r /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /root/", + onlyif => 'test -d /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot', returns => [0, 1], require => User[$::ssh_username] } @@ -372,7 +372,7 @@ if is_hash($firewall_values['rules']) and count($firewall_values['rules']) > 0 { ## Begin Apache manifest if $yaml_values == undef { - $yaml_values = loadyaml('/vagrant/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml') + $yaml_values = loadyaml('/vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml') } if $apache_values == undef { $apache_values = $yaml_values['apache'] } if $php_values == undef { diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.puppet-lint.rc b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.puppet-lint.rc similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.puppet-lint.rc rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.puppet-lint.rc diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CONTRIBUTING.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CONTRIBUTING.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CONTRIBUTING.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/CONTRIBUTING.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.passenger.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.passenger.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.passenger.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/README.passenger.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/files/httpd b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/files/httpd similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/files/httpd rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/files/httpd diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancer.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancer.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancer.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancer.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancermember.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancermember.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancermember.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/balancermember.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_confd_files.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_confd_files.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_confd_files.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_confd_files.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods/load.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods/load.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods/load.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/default_mods/load.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/dev.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/dev.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/dev.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/dev.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/listen.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/listen.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/listen.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/listen.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/actions.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/actions.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/actions.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/actions.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/alias.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/alias.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/alias.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/alias.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cache.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cache.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cache.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cache.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgi.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgi.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgi.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgi.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgid.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgid.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgid.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/cgid.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/deflate.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/deflate.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/deflate.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/deflate.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dev.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dev.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dev.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dev.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dir.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dir.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dir.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/dir.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/event.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/event.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/event.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/event.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/expires.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/expires.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/expires.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/expires.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/headers.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/headers.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/headers.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/headers.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/include.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/include.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/include.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/include.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/info.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/info.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/info.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/info.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/itk.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/itk.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/itk.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/itk.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ldap.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ldap.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ldap.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ldap.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/nss.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/nss.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/nss.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/nss.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/passenger.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/passenger.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/passenger.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/passenger.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/perl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/perl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/perl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/perl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/peruser.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/peruser.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/peruser.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/peruser.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/php.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/php.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/php.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/php.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/prefork.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/prefork.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/prefork.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/prefork.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/python.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/python.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/python.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/python.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/speling.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/speling.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/speling.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/speling.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ssl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ssl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ssl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/ssl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/status.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/status.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/status.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/status.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suexec.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suexec.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suexec.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suexec.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suphp.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suphp.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suphp.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/suphp.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/userdir.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/userdir.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/userdir.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/userdir.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/worker.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/worker.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/worker.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/worker.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mpm.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mpm.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mpm.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/mpm.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/package.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/package.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/package.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/package.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/processor.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/processor.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/processor.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/peruser/processor.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/php.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/php.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/php.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/php.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/proxy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/proxy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/proxy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/proxy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/python.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/python.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/python.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/python.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/ssl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/ssl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/ssl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/ssl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/version.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/version.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/version.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/version.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/vhost.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/vhost.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/vhost.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/manifests/vhost.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/service_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/service_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/service_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/classes/service_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/files/spec b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/files/spec similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/files/spec rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/files/spec diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/httpd.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/httpd.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/httpd.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/httpd.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/listen.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/listen.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/listen.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/listen.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/event.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/event.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/event.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/event.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/info.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/info.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/info.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/info.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/load.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/load.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/load.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/load.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/status.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/status.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/status.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/status.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/namevirtualhost.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/namevirtualhost.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/namevirtualhost.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/namevirtualhost.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/ports_header.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/ports_header.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/ports_header.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/ports_header.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_action.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_action.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_action.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_action.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_block.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_block.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_block.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_block.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_directories.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_directories.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_directories.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_directories.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_header.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_header.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_header.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_header.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_itk.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_itk.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_itk.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_itk.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rack.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rack.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rack.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rack.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/apache.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/apache.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/apache.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/apache.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/dev.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/dev.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/dev.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/dev.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mod_load_params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mod_load_params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mod_load_params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mod_load_params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods_custom.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods_custom.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods_custom.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/mods_custom.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/php.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/php.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/php.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/php.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_directories.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_directories.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_directories.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_directories.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ssl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ssl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ssl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhost_ssl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.project b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.project similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.project rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.project diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.puppet-lint.rc b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.puppet-lint.rc similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.puppet-lint.rc rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.puppet-lint.rc diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/backports.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/backports.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/backports.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/backports.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/builddep.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/builddep.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/builddep.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/builddep.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/conf.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/conf.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/conf.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/conf.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/testing.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/testing.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/testing.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/testing.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/unstable.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/unstable.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/unstable.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/debian/unstable.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/force.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/force.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/force.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/force.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/key.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/key.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/key.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/key.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/pin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/pin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/pin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/pin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/ppa.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/ppa.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/ppa.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/ppa.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/release.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/release.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/release.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/release.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/source.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/source.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/source.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/source.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/update.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/update.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/update.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/manifests/update.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/release_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/release_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/release_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/release_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/force_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/force_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/force_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/force_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/key_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/key_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/key_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/key_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/source_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/source_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/source_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/defines/source_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/10periodic.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/10periodic.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/10periodic.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/10periodic.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/pin.pref.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/pin.pref.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/pin.pref.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/pin.pref.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/source.list.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/source.list.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/source.list.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/templates/source.list.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/builddep.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/builddep.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/builddep.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/builddep.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/testing.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/testing.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/testing.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/testing.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/unstable.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/unstable.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/unstable.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/debian/unstable.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/force.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/force.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/force.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/force.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/key.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/key.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/key.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/key.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/pin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/pin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/pin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/pin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/ppa.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/ppa.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/ppa.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/ppa.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/release.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/release.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/release.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/release.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/source.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/source.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/source.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/source.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/run-tests.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/run-tests.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/run-tests.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/run-tests.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/lib/facter/composer_home.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/lib/facter/composer_home.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/lib/facter/composer_home.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/lib/facter/composer_home.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/exec.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/exec.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/exec.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/exec.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/project.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/project.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/project.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/manifests/project.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/templates/exec.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/templates/exec.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/templates/exec.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/templates/exec.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/project.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/project.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/project.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/composer/tests/project.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.gitattributes b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.gitattributes similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.gitattributes rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.gitattributes diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/files/concatfragments.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/fragment.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/fragment.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/fragment.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/fragment.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/setup.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/setup.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/setup.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/manifests/setup.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/fragment.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/fragment.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/fragment.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/fragment.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/concat/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/Puppetfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/Puppetfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/Puppetfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/Puppetfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/README b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/README similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/README rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/README diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/apt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/apt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/apt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/apt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dis.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dis.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dis.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dis.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/dl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/en.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/en.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/en.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/en.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git/drush.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git/drush.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git/drush.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/git/drush.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/make.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/make.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/make.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/make.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/run.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/run.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/run.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/run.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/status.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/status.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/status.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/manifests/status.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/.module b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/.module similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/.module rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/.module diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/test.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/test.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/test.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/test.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/apt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/apt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/apt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/apt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/defaults.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/defaults.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/defaults.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/defaults.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dis.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dis.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dis.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dis.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/dl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/en.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/en.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/en.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/en.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git/drush.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git/drush.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git/drush.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/git/drush.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/make.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/make.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/make.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/make.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/run.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/run.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/run.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/run.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/status.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/status.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/status.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/drush/tests/status.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/java.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/java.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/java.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/java.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/package.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/package.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/package.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/package.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/python.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/python.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/python.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/python.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/template.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/template.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/template.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/manifests/template.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._files b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._files similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._files rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._files diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._lib b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._lib similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._lib rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._lib diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._manifests b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._manifests similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._manifests rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._manifests diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._spec b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._spec similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._spec rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._spec diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._tests b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._tests similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._tests rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/._tests diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-7 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-7 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-7 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/._RPM-GPG-KEY-EPEL-7 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/._facter b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/._facter similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/._facter rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/._facter diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/._os_maj_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/._os_maj_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/._os_maj_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/._os_maj_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._rpm_gpg_key.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._rpm_gpg_key.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._rpm_gpg_key.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/._rpm_gpg_key.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._classes b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._classes similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._classes rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._classes diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._defines b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._defines similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._defines rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._defines diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper_system.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper_system.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper_system.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._spec_helper_system.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._system b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._system similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._system rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._system diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._unit b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._unit similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._unit rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/._unit diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._epel_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._epel_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._epel_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._epel_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_base.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_base.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_base.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_base.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_debuginfo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_debuginfo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_debuginfo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_debuginfo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_gpgkey.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_gpgkey.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_gpgkey.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_gpgkey.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_source.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_source.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_source.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_source.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_debuginfo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_debuginfo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_debuginfo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_debuginfo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_source.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_source.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_source.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/._shared_testing_source.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_base.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_base.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_base.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_base.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_source.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_source.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_source.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_source.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/._rpm_gpg_key_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/._rpm_gpg_key_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/._rpm_gpg_key_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/._rpm_gpg_key_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper_system.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper_system.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper_system.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/spec_helper_system.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._basic_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._basic_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._basic_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._basic_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._usage_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._usage_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._usage_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/._usage_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/basic_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/basic_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/basic_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/basic_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/usage_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/usage_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/usage_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/system/usage_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/._facter b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/._facter similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/._facter rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/._facter diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/._os_maj_version_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/._os_maj_version_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/._os_maj_version_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/._os_maj_version_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/._init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/._init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/._init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/._init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/epel/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.rspec b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.rspec similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.rspec rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.rspec diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile.lock b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile.lock similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile.lock rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Gemfile.lock diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/apt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/apt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/apt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/apt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/yum.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/yum.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/yum.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/manifests/repo/yum.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CONTRIBUTING.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CONTRIBUTING.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CONTRIBUTING.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/CONTRIBUTING.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/debian.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/debian.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/debian.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/debian.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/files/subtree/bash_completion.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/files/subtree/bash_completion.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/files/subtree/bash_completion.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/files/subtree/bash_completion.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/lib/facter/git_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/gitosis.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/gitosis.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/gitosis.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/gitosis.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/subtree.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/subtree.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/subtree.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/manifests/subtree.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/gitosis.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/gitosis.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/gitosis.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/gitosis.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/git/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/package.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/package.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/package.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/package.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mailcatcher/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/client/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/db.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/db.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/db.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/db.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/globals.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/globals.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/globals.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/globals.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/replset.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/replset.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/replset.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/replset.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/manifests/server/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/globals.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/globals.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/globals.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/globals.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/replicaset.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/replicaset.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/replicaset.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/replicaset.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mongodb/tests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/TODO b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/TODO similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/TODO rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/TODO diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/files/mysqltuner.pl b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/files/mysqltuner.pl similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/files/mysqltuner.pl rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/files/mysqltuner.pl diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/backup.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/backup.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/backup.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/backup.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/java.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/java.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/java.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/java.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/php.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/php.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/php.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/php.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/python.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/python.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/python.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/python.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/client/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/db.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/db.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/db.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/db.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/account_security.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/account_security.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/account_security.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/account_security.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/backup.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/backup.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/backup.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/backup.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/monitor.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/monitor.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/monitor.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/monitor.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/providers.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/providers.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/providers.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/providers.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/root_password.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/root_password.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/root_password.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/root_password.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/manifests/server/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/backup.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/backup.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/backup.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/backup.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/bindings.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/bindings.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/bindings.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/bindings.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/java.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/java.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/java.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/java.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_database.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_database.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_database.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_database.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_grant.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_grant.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_grant.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_grant.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_user.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_user.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_user.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/mysql_user.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/perl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/perl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/perl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/perl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/python.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/python.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/python.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/python.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/ruby.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/ruby.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/ruby.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/ruby.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/account_security.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/account_security.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/account_security.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/account_security.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/mysql/tests/server/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/.travis/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile.lock b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile.lock similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile.lock rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Puppetfile.lock diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/composer.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/composer.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/composer.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/composer.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/debian.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/debian.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/debian.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/debian.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/redhat.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/redhat.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/redhat.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/redhat.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/solaris.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/solaris.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/solaris.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/solaris.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/suse.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/suse.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/suse.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/package/suse.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/location.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/location.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/location.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/location.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/class_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/class_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/class_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/class_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/location_alias.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/location_alias.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/location_alias.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/location_alias.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/upstream.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/upstream.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/upstream.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/upstream.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CONTRIBUTING.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CONTRIBUTING.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CONTRIBUTING.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/CONTRIBUTING.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/manifests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/templates/ntp.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/templates/ntp.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/templates/ntp.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/templates/ntp.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/ntp/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.project b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.project similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.project rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.project diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/augeas.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/augeas.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/augeas.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/augeas.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/conf.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/conf.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/conf.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/conf.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/devel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/devel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/devel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/devel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/ini.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/ini.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/ini.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/ini.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/module.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/module.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/module.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/module.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/module.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/module.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/module.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pear/module.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/module.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/module.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/module.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/pecl/module.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/spec.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/spec.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/spec.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/manifests/spec.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/classes/php_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/classes/php_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/classes/php_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/classes/php_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/extra-ini.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/extra-ini.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/extra-ini.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/extra-ini.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/spec.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/spec.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/spec.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/php/templates/spec.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.project b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.project similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.project rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.project diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/NOTICE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/NOTICE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/NOTICE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/NOTICE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/client.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/client.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/client.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/client.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/globals.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/globals.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/globals.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/globals.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/java.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/java.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/java.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/java.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/python.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/python.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/python.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/lib/python.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/db.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/db.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/db.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/db.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/grant.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/grant.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/grant.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/grant.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/reload.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/reload.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/reload.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/reload.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/role.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/role.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/role.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/role.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/adminer.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/adminer.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/adminer.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/adminer.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/hhvm.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/hhvm.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/hhvm.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/hhvm.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ini.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ini.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ini.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ini.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/mariadb.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/mariadb.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/mariadb.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/mariadb.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/nginx.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/nginx.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/nginx.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/nginx.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/module.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/module.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/module.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/module.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pear.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pear.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pear.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pear.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/python/pip.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/python/pip.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/python/pip.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/python/pip.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xdebug.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xdebug.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xdebug.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xdebug.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xhprof.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xhprof.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xhprof.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/manifests/xhprof.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.project b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.project similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.project rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.project diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_check.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_check.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_check.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_check.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_deploy.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_deploy.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_deploy.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_deploy.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_info.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_info.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_info.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_info.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_log.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_log.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_log.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/README_log.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/composer.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/composer.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/composer.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/composer.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme-default b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme-default similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme-default rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/info/readme/readme-default diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mailpuppicheck b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mailpuppicheck similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mailpuppicheck rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mailpuppicheck diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppicheck b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppicheck similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppicheck rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppicheck diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppideploy b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppideploy similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppideploy rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/mcollective/puppideploy diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/archive.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/archive.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/archive.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/archive.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/check_project.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/check_project.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/check_project.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/check_project.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/database.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/database.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/database.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/database.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/delete.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/delete.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/delete.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/delete.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/execute.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/execute.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/execute.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/execute.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/firewall.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/firewall.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/firewall.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/firewall.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/functions b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/functions similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/functions rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/functions diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_file.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_file.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_file.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_file.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/git.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/git.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/git.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/git.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/header b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/header similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/header rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/header diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/service.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/service.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/service.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/service.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/svn.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/svn.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/svn.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/svn.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/wait.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/wait.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/wait.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/wait.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yant.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yant.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yant.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yant.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yum.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yum.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yum.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/files/scripts/yum.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/last_run.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/last_run.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/last_run.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/last_run.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/check.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/check.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/check.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/check.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/configure.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/configure.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/configure.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/configure.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/dependencies.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/dependencies.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/dependencies.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/dependencies.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/deploy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/deploy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/deploy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/deploy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/extras.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/extras.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/extras.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/extras.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helper.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helper.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helper.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helper.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helpers.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helpers.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helpers.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/helpers.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/instance.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/instance.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/instance.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/instance.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/module.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/module.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/module.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/module.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/readme.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/readme.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/readme.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/info/readme.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/initialize.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/initialize.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/initialize.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/initialize.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/install_packages.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/install_packages.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/install_packages.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/install_packages.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/log.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/log.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/log.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/log.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/netinstall.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/netinstall.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/netinstall.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/netinstall.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/one.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/one.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/one.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/one.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/README b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/README similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/README rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/README diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/archive.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/archive.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/archive.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/archive.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/builder.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/builder.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/builder.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/builder.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/dir.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/dir.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/dir.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/dir.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/files.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/files.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/files.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/files.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/git.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/git.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/git.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/git.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/maven.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/maven.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/maven.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/maven.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/mysql.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/mysql.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/mysql.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/mysql.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/svn.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/svn.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/svn.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/svn.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/tar.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/tar.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/tar.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/tar.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/war.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/war.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/war.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/war.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/yum.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/yum.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/yum.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/project/yum.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/report.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/report.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/report.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/report.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/rollback.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/rollback.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/rollback.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/rollback.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/run.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/run.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/run.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/run.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/runscript.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/runscript.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/runscript.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/runscript.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/skel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/skel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/skel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/skel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/todo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/todo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/todo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/todo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/two.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/two.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/two.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/two.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/ze.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/ze.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/ze.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/manifests/ze.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/instance.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/instance.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/instance.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/instance.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/module.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/module.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/module.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/module.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/puppet.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/puppet.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/puppet.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/puppet.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/readme.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/readme.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/readme.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/info/readme.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/install_packages.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/install_packages.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/install_packages.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/install_packages.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/log.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/log.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/log.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/log.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/project/config.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/project/config.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/project/config.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/project/config.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi_clean.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi_clean.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi_clean.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/puppi_clean.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/todo.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/todo.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/todo.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/puppi/templates/todo.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/TODO b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/TODO similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/TODO rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/TODO diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/management.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/management.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/management.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/management.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/policy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/policy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/policy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/policy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/manifests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/full.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/full.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/full.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/full.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/plugin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/plugin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/plugin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/plugin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/site.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/site.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/site.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/site.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/user/add.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/user/add.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/user/add.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/user/add.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Vagrantfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Vagrantfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Vagrantfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/Vagrantfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.logrotate.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.logrotate.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.logrotate.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.logrotate.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/redis/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/db.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/db.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/db.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/db.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sqlite/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Vagrantfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Vagrantfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Vagrantfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/Vagrantfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/deploy.html b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/deploy.html similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/deploy.html rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/deploy.html diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/extract.html b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/extract.html similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/extract.html rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/extract.html diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/file.html b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/file.html similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/file.html rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/file.html diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/init.html b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/init.html similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/init.html rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/docs/init.html diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.bz2 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.bz2 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.bz2 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.bz2 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.gz b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.gz similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.gz rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/files/sample.tar.gz diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/deploy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/deploy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/deploy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/deploy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/extract.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/extract.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/extract.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/extract.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/file.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/file.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/file.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/file.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/deploy.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/deploy.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/deploy.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/deploy.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/extract.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/extract.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/extract.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/extract.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/file.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/file.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/file.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/file.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/scope_defaults.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/scope_defaults.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/scope_defaults.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/scope_defaults.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/staging_parse.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/staging_parse.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/staging_parse.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/staging/tests/staging_parse.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CHANGELOG.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CHANGELOG.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CHANGELOG.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CHANGELOG.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CONTRIBUTING.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CONTRIBUTING.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CONTRIBUTING.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/CONTRIBUTING.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile.lock b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile.lock similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile.lock rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Gemfile.lock diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_SPECS.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_SPECS.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_SPECS.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/README_SPECS.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/stages.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/stages.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/stages.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/manifests/stages.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/file_line.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/file_line.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/file_line.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/file_line.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/stdlib/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.nodeset.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.nodeset.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.nodeset.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.nodeset.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Changelog b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Changelog similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Changelog rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Changelog diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/config.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/config.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/config.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/config.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/group.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/group.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/group.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/group.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/install.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/install.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/install.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/install.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/pip.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/pip.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/pip.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/pip.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/program.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/program.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/program.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/program.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/reload.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/reload.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/reload.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/reload.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/service.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/service.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/service.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/service.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/group.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/group.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/group.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/group.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/program.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/program.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/program.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/conf/program.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/group.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/group.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/group.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/group.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/program.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/program.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/program.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/supervisord/tests/program.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/ChangeLog b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/ChangeLog similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/ChangeLog rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/ChangeLog diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/base.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/base.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/base.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/base.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/metadata.json b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/metadata.json similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/metadata.json rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/metadata.json diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/base.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/base.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/base.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/base.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/sysctl/tests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/CHANGELOG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/CHANGELOG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/CHANGELOG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/CHANGELOG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.BZR.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.BZR.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.BZR.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.BZR.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.CVS.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.CVS.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.CVS.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.CVS.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.GIT.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.GIT.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.GIT.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.GIT.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.HG.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.HG.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.HG.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.HG.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.SVN.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.SVN.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.SVN.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.SVN.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec.opts b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec.opts similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec.opts rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec.opts diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.fixtures.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.fixtures.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.fixtures.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.fixtures.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.gemfile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.gemfile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.gemfile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.gemfile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.project b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.project similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.project rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.project diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.travis.yml b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.travis.yml similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.travis.yml rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/.travis.yml diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/LICENSE b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/LICENSE similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/LICENSE rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/LICENSE diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Modulefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Modulefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Modulefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Modulefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/README.md b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/README.md similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/README.md rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/README.md diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Rakefile b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Rakefile similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Rakefile rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/Rakefile diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/empty/.placeholder b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/empty/.placeholder similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/empty/.placeholder rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/empty/.placeholder diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/yum-updatesd.conf b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/yum-updatesd.conf similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/yum-updatesd.conf rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/files/yum-updatesd.conf diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/cron.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/cron.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/cron.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/cron.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/defaults.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/defaults.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/defaults.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/defaults.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/init.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/init.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/init.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/init.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/params.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/params.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/params.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/params.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/plugin.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/plugin.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/plugin.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/plugin.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/prerequisites.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/prerequisites.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/prerequisites.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/prerequisites.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/10gen.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/10gen.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/10gen.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/10gen.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atomic.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atomic.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atomic.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atomic.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centalt.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centalt.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centalt.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centalt.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos4.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos4.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos4.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos4.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos5.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos5.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos5.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos5.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos6.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos6.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos6.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos6.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/ceph.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/ceph.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/ceph.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/ceph.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/epel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/epel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/epel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/epel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/foreman.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/foreman.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/foreman.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/foreman.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/karan.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/karan.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/karan.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/karan.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/nginx.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/nginx.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/nginx.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/nginx.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/passenger.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/passenger.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/passenger.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/passenger.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rbel.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rbel.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rbel.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rbel.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl5.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl5.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl5.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl5.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl6.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl6.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl6.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/sl6.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/tmz.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/tmz.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/tmz.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/tmz.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/varnish.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/varnish.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/varnish.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/varnish.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/updatesd.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/updatesd.pp similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/updatesd.pp rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/manifests/updatesd.pp diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/spec_helper.rb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/spec_helper.rb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/spec_helper.rb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/spec/spec_helper.rb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/templates/yum-cron.erb b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/templates/yum-cron.erb similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/templates/yum-cron.erb rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/yum/templates/yum-cron.erb diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/execute-files.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/execute-files.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/execute-files.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/execute-files.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/hostsupdater-notice.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/hostsupdater-notice.txt similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/hostsupdater-notice.txt rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/hostsupdater-notice.txt diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.sh diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt new file mode 100644 index 0000000000..5251c3e331 --- /dev/null +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt @@ -0,0 +1,39 @@ +▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔ + _____ _ _ + | __ \| | | | + | |__) | |__ _ __ __ _ ___ ___ __ _ _ __ ___| |_ + | ___/| '_ \| '__/ _` / __|/ _ \/ _` | '_ \ / _ \ __| + | | | | | | | | (_| \__ \ __/ (_| | | | | __/ |_ + |_| |_| |_|_| \__,_|___/\___|\__,_|_| |_|\___|\__| + +▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔ + +Read me for some important information! + +If Puppet did not blow up (you do not see a sea of red above), then your VM +was generated successfully! + +* You can print current ssh information by running 'vagrant ssh-config' + command + +* To access to phraseanet just type 'phraseanet-php54-nginx' in + your web browser address bar. + +* The mysql default credentials are: + user: root + password: toor + +Did something go wrong? Please fill a Github issues at +https://github.com/alchemy-fr/phraseanet/issues. + +Happy programming! + - Phraseanet Team + +▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔ + ____ _ _ _ _ + | _ \ ___ __ _ __| | / \ | |__ _____ _____| | + | |_) / _ \/ _` |/ _` | / _ \ | '_ \ / _ \ \ / / _ \ | + | _ < __/ (_| | (_| | / ___ \| |_) | (_) \ V / __/_| + |_| \_\___|\__,_|\__,_| /_/ \_\_.__/ \___/ \_/ \___(_) + +▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔ diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/initial-setup.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/initial-setup.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/initial-setup.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/initial-setup.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/os-detect.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/os-detect.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/os-detect.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/os-detect.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/r10k.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/r10k.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/r10k.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/r10k.sh diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt new file mode 100644 index 0000000000..6c00d6839b --- /dev/null +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt @@ -0,0 +1,2 @@ + +Generated using puphpet.com diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/ssh-keygen.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/ssh-keygen.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/ssh-keygen.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/ssh-keygen.sh diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/update-puppet.sh b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/update-puppet.sh similarity index 100% rename from vagrant/vms/phraseanet-php54-nginx/puphpet/shell/update-puppet.sh rename to resources/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/update-puppet.sh diff --git a/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig index e868ba9574..c95ff483fe 100644 --- a/templates/web/admin/databox/databox.html.twig +++ b/templates/web/admin/databox/databox.html.twig @@ -50,6 +50,11 @@ ({{ 'phraseanet:: details' | trans }})
    • +
  • + {{ 'admin::base: subdefs to be created :' | trans }} + +
    • + {% if showDetail %}
  • {{ 'admin::base: nombre de mots uniques sur la base :' | trans }} @@ -276,6 +281,13 @@ p = 100*data.thesaurus_indexed/data.records; $("#thesaurus_indexed_bar").width(Math.round(2*p)); $("#thesaurus_indexed_percent").text((Math.round(p*100)/100)+" %"); + + var t = ""; + for(var i in data.jeton_subdef) + { + t += (t==""?"":" ; ") + i + ": " + data.jeton_subdef[i]; + } + $("#subdefs_todo").text(t); } if(data.printLogoURL) diff --git a/templates/web/prod/thesaurus.js.twig b/templates/web/prod/thesaurus.js.twig index 8bfd8bbdb4..2958ad8679 100644 --- a/templates/web/prod/thesaurus.js.twig +++ b/templates/web/prod/thesaurus.js.twig @@ -340,7 +340,7 @@ function T_acceptCandidates_OK() + j.parm['sbid'] + '\\.' + j.parm['id'].replace(new RegExp("\\.", "g"), "\\."); // escape les '.' pour jquery - $(z).replaceWith(j.html); + $(z).children('ul').eq(0).replaceWith(j.html); } , "json"); } @@ -634,12 +634,7 @@ function Xclick(e) { if(is_ctrl_key(e)) { - var oldField = ul.attr('field'); - ul.remove(); - if(oldField) - li.append(''); - else - li.append(''); + ul.text("{{ 'prod::thesaurusTab:tree:loading' | trans }}"); li.removeAttr('loaded'); } @@ -654,7 +649,8 @@ function Xclick(e) zurl += "&sortsy=1"; $.get(zurl, [], function(j) { - li.replaceWith(j.html); + ul.replaceWith(j.html); + li.attr('loaded', '1'); } , "json"); } diff --git a/templates/web/setup/step2.html.twig b/templates/web/setup/step2.html.twig index ce818dd616..5c05fdcd11 100644 --- a/templates/web/setup/step2.html.twig +++ b/templates/web/setup/step2.html.twig @@ -651,7 +651,7 @@ - +
    diff --git a/tests/Alchemy/Tests/Phrasea/ApplicationTest.php b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php index 9c01ff1686..9568ce40fa 100644 --- a/tests/Alchemy/Tests/Phrasea/ApplicationTest.php +++ b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php @@ -341,7 +341,7 @@ class ApplicationTest extends \PhraseanetTestCase */ public function testCachedTranslator($key, $locale, $expected) { - $tempDir = __DIR__ . '/temp-trans'; + $tempDir = sys_get_temp_dir() . '/temp-trans'; $this->cleanupTempDir($tempDir); $app = $this->getPreparedApp($tempDir); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php index 7cbefe58bf..f3d4d66f4f 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php @@ -170,14 +170,14 @@ class DoDownloadTest extends \PhraseanetAuthenticatedWebTestCase self::$DI['app'], $token, $list, - sprintf('%s/../../../../../../tmp/download/%s.zip', __DIR__, $token->getValue()) // Dest file + sprintf('%s/%s.zip', self::$DI['app']['tmp.download.path'], $token->getValue()) // Dest file ); // Check response $url = sprintf('/download/%s/get/', $token->getValue()); self::$DI['client']->request('POST', $url); $response = self::$DI['client']->getResponse(); - $this->assertTrue($response->isOk()); + $this->assertTrue($response->isOk(),$response); $this->assertRegExp('#attachment#', $response->headers->get('content-disposition')); $this->assertEquals('application/zip', $response->headers->get('content-type')); $nbRowLogsAfter = $this->getNbRowLogs(self::$DI['record_1']->get_databox()); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php index 3a611b68ec..62a213f2da 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php @@ -134,8 +134,8 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase $lazaretFile = $this->getOneLazaretFile(); - $lazaretFileName = self::$DI['app']['root.path'] . '/tmp/lazaret/' . $lazaretFile->getFilename(); - $lazaretThumbFileName = self::$DI['app']['root.path'] . '/tmp/lazaret/' . $lazaretFile->getThumbFilename(); + $lazaretFileName = self::$DI['app']['tmp.lazaret.path'].'/'.$lazaretFile->getFilename(); + $lazaretThumbFileName = self::$DI['app']['tmp.lazaret.path'].'/'.$lazaretFile->getThumbFilename(); copy(__DIR__ . '/../../../../../files/cestlafete.jpg', $lazaretFileName); copy(__DIR__ . '/../../../../../files/cestlafete.jpg', $lazaretThumbFileName); @@ -341,7 +341,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase ->method('getRecordsToSubstitute') ->will($this->returnValue([self::$DI['record_2'], self::$DI['record_1']])); - copy(__DIR__ . '/../../../../../files/cestlafete.jpg', __DIR__ . '/../../../../../../tmp/lazaret/cestlafete.jpg'); + copy(__DIR__ . '/../../../../../files/cestlafete.jpg', self::$DI['app']['tmp.lazaret.path'].'/cestlafete.jpg'); $lazaretFile->expects($this->any()) ->method('getFilename') @@ -468,7 +468,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase { $lazaretFile = $this->getMock('Alchemy\Phrasea\Model\Entities\LazaretFile', [], [], '', false); - copy(__DIR__ . '/../../../../../files/cestlafete.jpg', __DIR__ . '/../../../../../../tmp/lazaret/cestlafete.jpg'); + copy(__DIR__ . '/../../../../../files/cestlafete.jpg', self::$DI['app']['tmp.lazaret.path'].'/cestlafete.jpg'); $lazaretFile->expects($this->any()) ->method('getThumbFilename') diff --git a/tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php b/tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php index ea0c4aa01c..183f8bbc59 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php @@ -121,7 +121,7 @@ class SetupTest extends \PhraseanetWebTestCase $this->app['authentication'] = $authenticator; $client = $this->createClient(); - $settings = Yaml::parse(file_get_contents(__DIR__ . '/../../../../../hudson/InstallDBs.yml')); + $settings = Yaml::parse(file_get_contents(__DIR__ . '/../../../../../resources/hudson/InstallDBs.yml')); $settings = $settings['database']; $host = isset($settings['host']) ? $settings['host'] : 'localhost'; diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml index 2121849d12..355ae28797 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml @@ -71,15 +71,13 @@ main: mp4box_timeout: 60 swftools_timeout: 60 unoconv_timeout: 60 - task-manager: - status: started - listener: - protocol: tcp - host: 127.0.0.1 - port: 6700 storage: - subdefs: - default-dir: null + subdefs: null + cache: null + log : null + download: null + lazaret: null + caption: null bridge: youtube: enabled: false @@ -205,3 +203,8 @@ session: idle: 0 # 1 week lifetime: 604800 +crossdomain: + allow-access-from: + - + domain: '*.cooliris.com' + secure: 'false' diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml index 2121849d12..355ae28797 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml @@ -71,15 +71,13 @@ main: mp4box_timeout: 60 swftools_timeout: 60 unoconv_timeout: 60 - task-manager: - status: started - listener: - protocol: tcp - host: 127.0.0.1 - port: 6700 storage: - subdefs: - default-dir: null + subdefs: null + cache: null + log : null + download: null + lazaret: null + caption: null bridge: youtube: enabled: false @@ -205,3 +203,8 @@ session: idle: 0 # 1 week lifetime: 604800 +crossdomain: + allow-access-from: + - + domain: '*.cooliris.com' + secure: 'false' diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php deleted file mode 100644 index e042973fc8..0000000000 --- a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php +++ /dev/null @@ -1,35 +0,0 @@ -getPanel()->getAvailableCharsets(); - - $this->assertInternalType('array', $charsets); - foreach ($charsets as $name => $charset) { - $this->assertInternalType('string', $name); - $this->assertInstanceOf('Alchemy\Phrasea\SearchEngine\SphinxSearch\AbstractCharset', $charset); - } - } - - public function testGenerateSphinxConf() - { - $databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes(); - $configuration = $this->getPanel()->getConfiguration(); - - $conf = $this->getPanel()->generateSphinxConf($databoxes, $configuration); - $this->assertInternalType('string', $conf); - } - -} diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php deleted file mode 100644 index da09cfe445..0000000000 --- a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php +++ /dev/null @@ -1,166 +0,0 @@ -find('indexer'); - - $searchd = $binaryFinder->find('searchd'); - - if (!$indexer || !$searchd) { - self::$skipped = true; - - return; - } - - $app = self::$DI['app']; - $appbox = $app['phraseanet.appbox']; - - $app['conf']->set(['main', 'search-engine', 'options'], [ - 'host' => '127.0.0.1', - 'port' => 9312, - 'rt_host' => '127.0.0.1', - 'rt_port' => 9306, - ]); - - self::$searchEngine = SphinxSearchEngine::create($app, $app['conf']->get(['main', 'search-engine', 'options'])); - - self::$config = tempnam(sys_get_temp_dir(), 'tmp_sphinx.conf'); - $configuration = self::$searchEngine->getConfigurationPanel()->getConfiguration(); - $configuration['date_fields'] = []; - - foreach ($appbox->get_databoxes() as $databox) { - foreach ($databox->get_meta_structure() as $databox_field) { - if ($databox_field->get_type() != \databox_field::TYPE_DATE) { - continue; - } - $configuration['date_fields'][] = $databox_field->get_name(); - } - } - - $configuration['date_fields'] = array_unique($configuration['date_fields']); - - self::$searchEngine->getConfigurationPanel()->saveConfiguration($configuration); - - $configFile = self::$searchEngine->getConfigurationPanel()->generateSphinxConf($appbox->get_databoxes(), $configuration); - - file_put_contents(self::$config, $configFile); - - $process = new Process($indexer . ' --all -c ' . self::$config); - $process->run(); - - self::$searchd = new Process($searchd . ' -c ' . self::$config); - self::$searchd->run(); - - self::$searchEngine = SphinxSearchEngine::create($app, $app['conf']->get(['main', 'search-engine', 'options'])); - self::$searchEngineClass = 'Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine'; - } - - public function setUp() - { - parent::setUp(); - if (self::$skipped) { - $this->markTestSkipped('SphinxSearch is not present on system'); - } - } - - public function tearDown() - { - if (!self::$skipped) { - self::$searchEngine->removeRecord(self::$DI['record_2']); - } - - parent::tearDown(); - } - - public function initialize() - { - } - - public static function tearDownAfterClass() - { - if (!self::$skipped) { - $binaryFinder = new ExecutableFinder(); - $searchd = $binaryFinder->find('searchd'); - - self::$searchd = new Process($searchd . ' --stop -c ' . self::$config); - self::$searchd->run(); - - unlink(self::$config); - } - - self::$skipped = self::$config = self::$searchd = null; - parent::tearDownAfterClass(); - } - - /** - * @covers Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine::autocomplete - */ - public function testAutocomplete() - { - $record = self::$DI['record_2']; - - $toupdate = []; - - foreach ($record->get_databox()->get_meta_structure()->get_elements() as $field) { - try { - $values = $record->get_caption()->get_field($field->get_name())->get_values(); - $value = array_pop($values); - $meta_id = $value->getId(); - } catch (\Exception $e) { - $meta_id = null; - } - - $toupdate[$field->get_id()] = [ - 'meta_id' => $meta_id - , 'meta_struct_id' => $field->get_id() - , 'value' => 'jeanne, jeannine, jeannette, jean-pierre et jean claude' - ]; - break; - } - - $record->set_metadatas($toupdate); - - self::$searchEngine->addRecord($record); - $this->updateIndex(); - - $binaryFinder = new ExecutableFinder(); - $indexer = $binaryFinder->find('indexer'); - - $appbox = self::$DI['app']['phraseanet.appbox']; - self::$searchEngine->buildSuggestions($appbox->get_databoxes(), self::$config, 0); - - $process = new Process($indexer . ' --all --rotate -c ' . self::$config); - $process->run(); - usleep(500000); - - $suggestions = self::$searchEngine->autocomplete('jean', $this->options); - $this->assertInstanceOf('\\Doctrine\\Common\\Collections\\ArrayCollection', $suggestions); - - $this->assertGreaterThan(2, count($suggestions)); - - foreach ($suggestions as $suggestion) { - $this->assertInstanceof('\\Alchemy\\Phrasea\\SearchEngine\\SearchEngineSuggestion', $suggestion); - } - } - - protected function updateIndex(array $stemms = []) - { - return $this; - } -} diff --git a/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php b/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php index 6cb7bcc74c..17c0d02a55 100644 --- a/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php +++ b/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php @@ -33,7 +33,7 @@ abstract class AbstractSetupTester extends \PhraseanetTestCase $this->uninstall(); - copy(__DIR__ . '/../../../../../hudson/_GV.php', __DIR__ . '/../../../../../config/_GV.php'); + copy(__DIR__ . '/../../../../../resources/hudson/_GV.php', __DIR__ . '/../../../../../config/_GV.php'); file_put_contents( __DIR__ . '/../../../../../config/_GV.php', str_replace('http://local.phrasea/', 'http://local.phrasea.tester/', file_get_contents( __DIR__ . '/../../../../../config/_GV.php'))); diff --git a/tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php b/tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php index ca4a2dc4f7..652b88ba0b 100644 --- a/tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php +++ b/tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php @@ -30,25 +30,22 @@ class InstallerTest extends \PhraseanetTestCase parent::tearDownAfterClass(); } - /** - * @covers Alchemy\Phrasea\Setup\Installer - */ public function testInstall() { $app = new Application('test'); $app->bindRoutes(); $parser = new Parser(); - $connDatas = $parser->parse(file_get_contents(__DIR__ . '/../../../../../config/configuration.yml')); - $credentials = $connDatas['main']['database']; + $config = $parser->parse(file_get_contents(__DIR__ . '/../../../../../config/configuration.yml')); + $credentials = $config['main']['database']; - $config = __DIR__ . '/configuration.yml'; - $compiled = __DIR__ . '/configuration.yml.php'; + $configFile = __DIR__ . '/configuration.yml'; + $compiledFile = __DIR__ . '/configuration.yml.php'; - @unlink($config); - @unlink($compiled); + @unlink($configFile); + @unlink($compiledFile); - $app['configuration.store'] = new Configuration(new Yaml(), new Compiler(), $config, $compiled, true); + $app['configuration.store'] = new Configuration(new Yaml(), new Compiler(), $configFile, $compiledFile, true); $abConn = self::$DI['app']['dbal.provider']->get([ 'host' => 'localhost', @@ -67,11 +64,17 @@ class InstallerTest extends \PhraseanetTestCase ]); $dbConn->connect(); - $template = 'en'; + // empty databases + $stmt = $abConn->prepare('DROP DATABASE ab_unitTests; CREATE DATABASE ab_unitTests'); + $stmt->execute(); + $stmt = $abConn->prepare('DROP DATABASE db_unitTests; CREATE DATABASE db_unitTests'); + $stmt->execute(); + unset($stmt); + $dataPath = __DIR__ . '/../../../../../datas/'; $installer = new Installer($app); - $installer->install(uniqid('admin') . '@example.com', 'sdfsdsd', $abConn, 'http://local.phrasea.test.installer/', $dataPath, $dbConn, $template); + $installer->install(uniqid('admin') . '@example.com', 'sdfsdsd', $abConn, 'http://local.phrasea.test.installer/', $dataPath, $dbConn, 'en'); $this->assertTrue($app['configuration.store']->isSetup()); $this->assertTrue($app['phraseanet.configuration-tester']->isUpToDate()); @@ -85,7 +88,7 @@ class InstallerTest extends \PhraseanetTestCase $this->assertArrayHasKey('key', $conf['main']); $this->assertGreaterThan(10, strlen($conf['main']['key'])); - @unlink($config); - @unlink($compiled); + @unlink($configFile); + @unlink($compiledFile); } } diff --git a/tests/Alchemy/Tests/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39UsersTest.php b/tests/Alchemy/Tests/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39UsersTest.php index 2c3feda712..e714699aa7 100644 --- a/tests/Alchemy/Tests/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39UsersTest.php +++ b/tests/Alchemy/Tests/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39UsersTest.php @@ -103,8 +103,8 @@ class Upgrade39UsersTest extends \PhraseanetTestCase public function provideVariousFixtures() { return [ - ['tests/update39_fixtureFrom38.sql'], - ['tests/update39_fixtureFrom31.sql'], + ['tests/fixtures/update39_fixtureFrom38.sql'], + ['tests/fixtures/update39_fixtureFrom31.sql'], ]; } diff --git a/tests/Alchemy/Tests/Phrasea/Utilities/CrossDomainDumperTest.php b/tests/Alchemy/Tests/Phrasea/Utilities/CrossDomainDumperTest.php new file mode 100644 index 0000000000..eee53b2d13 --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Utilities/CrossDomainDumperTest.php @@ -0,0 +1,87 @@ +assertEquals($dumper->dump($configuration), $expected); + } + + public function crossDomainProvider() + { + return array( + array( + array( + 'site-control' => 'master-only', + 'allow-access-from' => array( + array( + 'domain'=> '*.example.com', + 'secure'=> 'false' + ), + array( + 'domain'=> 'www.example.com', + 'secure'=>'true', + 'to-ports'=>'507,516-523' + ) + ), + 'allow-access-from-identity' => array( + array( + 'fingerprint-algorithm'=> 'sha-1', + 'fingerprint'=> '01:23:45:67:89:ab:cd:ef:01:23:45:67:89:ab:cd:ef:01:23:45:67' + ), + array( + 'fingerprint-algorithm'=> 'sha256', + 'fingerprint' => '01:23:45:67:89:ab:cd:ef:01:23:45:67:89:ab:cd:ef:01:23:45:67' + ) + ), + 'allow-http-request-headers-from' => array( + array( + 'domain'=> '*.bar.com', + 'secure'=> 'true', + 'headers'=> 'SOAPAction, X-Foo*' + ), + array( + 'domain'=> 'foo.example.com', + 'secure'=> 'false', + 'headers'=> 'Authorization,X-Foo*' + ) + ), + ), + ' + + + + + + + + + +' + ), + array( + array( + 'allow-access-from' => array( + array( + 'domain'=> '*.cooliris.com', + 'secure'=> 'false' + ) + ) + ), + ' + + + +' + ) + ); + } +} diff --git a/tests/Alchemy/Tests/Phrasea/Utilities/CrossDomainParserTest.php b/tests/Alchemy/Tests/Phrasea/Utilities/CrossDomainParserTest.php new file mode 100644 index 0000000000..bfdda75d56 --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Utilities/CrossDomainParserTest.php @@ -0,0 +1,49 @@ +assertEquals($parser->parse(__DIR__.'/fixture.crossdomain.xml'), array( + 'site-control' => 'master-only', + 'allow-access-from' => array( + array( + 'domain'=> '*.example.com', + 'secure'=> 'false' + ), + array( + 'domain'=> 'www.example.com', + 'secure'=>'true', + 'to-ports'=>'507,516-523' + ) + ), + 'allow-access-from-identity' => array( + array( + 'fingerprint-algorithm'=> 'sha-1', + 'fingerprint'=> '01:23:45:67:89:ab:cd:ef:01:23:45:67:89:ab:cd:ef:01:23:45:67' + ), + array( + 'fingerprint-algorithm'=> 'sha256', + 'fingerprint' => '01:23:45:67:89:ab:cd:ef:01:23:45:67:89:ab:cd:ef:01:23:45:67' + ) + ), + 'allow-http-request-headers-from' => array( + array( + 'domain'=> '*.bar.com', + 'secure'=> 'true', + 'headers'=> 'SOAPAction, X-Foo*' + ), + array( + 'domain'=> 'foo.example.com', + 'secure'=> 'false', + 'headers'=> 'Authorization,X-Foo*' + ) + ) + )); + } +} diff --git a/tests/Alchemy/Tests/Phrasea/Utilities/fixture.crossdomain.xml b/tests/Alchemy/Tests/Phrasea/Utilities/fixture.crossdomain.xml new file mode 100644 index 0000000000..1629d73f9e --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Utilities/fixture.crossdomain.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/classes/PhraseanetTestCase.php b/tests/classes/PhraseanetTestCase.php index c142c657f0..47820c0169 100644 --- a/tests/classes/PhraseanetTestCase.php +++ b/tests/classes/PhraseanetTestCase.php @@ -46,14 +46,17 @@ abstract class PhraseanetTestCase extends WebTestCase private static $fixtureIds = []; - protected function initializeSqliteDB($path = '/tmp/db.sqlite') + protected function initializeSqliteDB($path = null) { + if (null === $path) { + $path = sys_get_temp_dir().'/db.sqlite'; + } $path = $path . getmypid(); if (is_file($path)) { unlink($path); } - copy(__DIR__ . '/../db-ref.sqlite', $path); + copy(sys_get_temp_dir().'/db-ref.sqlite', $path); } public function getApplicationPath() @@ -250,7 +253,7 @@ abstract class PhraseanetTestCase extends WebTestCase exit(1); } - self::$fixtureIds = array_merge(self::$fixtureIds, json_decode(file_get_contents(__DIR__ .'/../fixtures.json'), true)); + self::$fixtureIds = array_merge(self::$fixtureIds, json_decode(file_get_contents(sys_get_temp_dir().'/fixtures.json'), true)); self::resetUsersRights(self::$DI['app'], self::$DI['user']); self::resetUsersRights(self::$DI['app'], self::$DI['user_notAdmin']); diff --git a/tests/update39_fixtureFrom31.sql b/tests/fixtures/update39_fixtureFrom31.sql similarity index 100% rename from tests/update39_fixtureFrom31.sql rename to tests/fixtures/update39_fixtureFrom31.sql diff --git a/tests/update39_fixtureFrom38.sql b/tests/fixtures/update39_fixtureFrom38.sql similarity index 100% rename from tests/update39_fixtureFrom38.sql rename to tests/fixtures/update39_fixtureFrom38.sql diff --git a/tmp/.gitignore b/tmp/.gitignore deleted file mode 100644 index a2ae30c907..0000000000 --- a/tmp/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!.gitignore -!doctrine-proxies/* diff --git a/tmp/batches/.gitignore b/tmp/batches/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/batches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/cache/profiler/.gitignore b/tmp/cache/profiler/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/cache/profiler/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/cache_minify/.gitignore b/tmp/cache_minify/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/cache_minify/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/cache_twig/.gitignore b/tmp/cache_twig/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/cache_twig/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/caption/.gitkeep b/tmp/caption/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tmp/desc_tmp/.gitignore b/tmp/desc_tmp/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/desc_tmp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php deleted file mode 100644 index 40d9276ab2..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php +++ /dev/null @@ -1,235 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'value'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AggregateToken' . "\0" . 'value'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (AggregateToken $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setValue($value) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', array($value)); - - return parent::setValue($value); - } - - /** - * {@inheritDoc} - */ - public function getValue() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', array()); - - return parent::getValue(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php deleted file mode 100644 index 464185f6a5..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php +++ /dev/null @@ -1,279 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'username', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'ip', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'locked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'created'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'username', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'ip', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'locked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\AuthFailure' . "\0" . 'created'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (AuthFailure $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUsername($username) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUsername', array($username)); - - return parent::setUsername($username); - } - - /** - * {@inheritDoc} - */ - public function getUsername() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUsername', array()); - - return parent::getUsername(); - } - - /** - * {@inheritDoc} - */ - public function setIp($ip) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIp', array($ip)); - - return parent::setIp($ip); - } - - /** - * {@inheritDoc} - */ - public function getIp() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIp', array()); - - return parent::getIp(); - } - - /** - * {@inheritDoc} - */ - public function setLocked($locked) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLocked', array($locked)); - - return parent::setLocked($locked); - } - - /** - * {@inheritDoc} - */ - public function getLocked() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLocked', array()); - - return parent::getLocked(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php deleted file mode 100644 index 1655eaddd6..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php +++ /dev/null @@ -1,477 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'is_read', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'pusher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'archived', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'validation', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'order'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'description', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'is_read', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'pusher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'archived', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'validation', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Basket' . "\0" . 'order'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Basket $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', array($name)); - - return parent::setName($name); - } - - /** - * {@inheritDoc} - */ - public function getName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', array()); - - return parent::getName(); - } - - /** - * {@inheritDoc} - */ - public function setDescription($description) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDescription', array($description)); - - return parent::setDescription($description); - } - - /** - * {@inheritDoc} - */ - public function getDescription() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDescription', array()); - - return parent::getDescription(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setIsRead($isRead) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsRead', array($isRead)); - - return parent::setIsRead($isRead); - } - - /** - * {@inheritDoc} - */ - public function getIsRead() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIsRead', array()); - - return parent::getIsRead(); - } - - /** - * {@inheritDoc} - */ - public function setPusher(\Alchemy\Phrasea\Model\Entities\User $user = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPusher', array($user)); - - return parent::setPusher($user); - } - - /** - * {@inheritDoc} - */ - public function getPusher() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPusher', array()); - - return parent::getPusher(); - } - - /** - * {@inheritDoc} - */ - public function setArchived($archived) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setArchived', array($archived)); - - return parent::setArchived($archived); - } - - /** - * {@inheritDoc} - */ - public function getArchived() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getArchived', array()); - - return parent::getArchived(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setValidation(\Alchemy\Phrasea\Model\Entities\ValidationSession $validation = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValidation', array($validation)); - - return parent::setValidation($validation); - } - - /** - * {@inheritDoc} - */ - public function getValidation() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidation', array()); - - return parent::getValidation(); - } - - /** - * {@inheritDoc} - */ - public function addElement(\Alchemy\Phrasea\Model\Entities\BasketElement $elements) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', array($elements)); - - return parent::addElement($elements); - } - - /** - * {@inheritDoc} - */ - public function removeElement(\Alchemy\Phrasea\Model\Entities\BasketElement $elements) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', array($elements)); - - return parent::removeElement($elements); - } - - /** - * {@inheritDoc} - */ - public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrder', array($order)); - - return parent::setOrder($order); - } - - /** - * {@inheritDoc} - */ - public function getOrder() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrder', array()); - - return parent::getOrder(); - } - - /** - * {@inheritDoc} - */ - public function getElements() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', array()); - - return parent::getElements(); - } - - /** - * {@inheritDoc} - */ - public function getElementsByOrder($ordre) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElementsByOrder', array($ordre)); - - return parent::getElementsByOrder($ordre); - } - - /** - * {@inheritDoc} - */ - public function hasRecord(\Alchemy\Phrasea\Application $app, \record_adapter $record) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasRecord', array($app, $record)); - - return parent::hasRecord($app, $record); - } - - /** - * {@inheritDoc} - */ - public function getSize(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSize', array($app)); - - return parent::getSize($app); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php deleted file mode 100644 index abe2d4ce90..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php +++ /dev/null @@ -1,400 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'validation_datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'basket'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'validation_datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\BasketElement' . "\0" . 'basket'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (BasketElement $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setRecordId($recordId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', array($recordId)); - - return parent::setRecordId($recordId); - } - - /** - * {@inheritDoc} - */ - public function getRecordId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', array()); - - return parent::getRecordId(); - } - - /** - * {@inheritDoc} - */ - public function setSbasId($sbasId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', array($sbasId)); - - return parent::setSbasId($sbasId); - } - - /** - * {@inheritDoc} - */ - public function getSbasId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', array()); - - return parent::getSbasId(); - } - - /** - * {@inheritDoc} - */ - public function getRecord(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', array($app)); - - return parent::getRecord($app); - } - - /** - * {@inheritDoc} - */ - public function setRecord(\record_adapter $record) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecord', array($record)); - - return parent::setRecord($record); - } - - /** - * {@inheritDoc} - */ - public function setOrd($ord) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrd', array($ord)); - - return parent::setOrd($ord); - } - - /** - * {@inheritDoc} - */ - public function getOrd() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrd', array()); - - return parent::getOrd(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function addValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addValidationData', array($validationDatas)); - - return parent::addValidationData($validationDatas); - } - - /** - * {@inheritDoc} - */ - public function removeValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeValidationData', array($validationDatas)); - - return parent::removeValidationData($validationDatas); - } - - /** - * {@inheritDoc} - */ - public function getValidationDatas() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidationDatas', array()); - - return parent::getValidationDatas(); - } - - /** - * {@inheritDoc} - */ - public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', array($basket)); - - return parent::setBasket($basket); - } - - /** - * {@inheritDoc} - */ - public function getBasket() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', array()); - - return parent::getBasket(); - } - - /** - * {@inheritDoc} - */ - public function setLastInBasket() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastInBasket', array()); - - return parent::setLastInBasket(); - } - - /** - * {@inheritDoc} - */ - public function getUserValidationDatas(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUserValidationDatas', array($user)); - - return parent::getUserValidationDatas($user); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php deleted file mode 100644 index 0e6ed3d591..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php +++ /dev/null @@ -1,587 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'public', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'iconUrl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'publishers', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'entries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'tokens'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'public', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'iconUrl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'publishers', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'entries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Feed' . "\0" . 'tokens'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Feed $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setIsPublic($public) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsPublic', array($public)); - - return parent::setIsPublic($public); - } - - /** - * {@inheritDoc} - */ - public function isPublic() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublic', array()); - - return parent::isPublic(); - } - - /** - * {@inheritDoc} - */ - public function setIconUrl($iconUrl) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIconUrl', array($iconUrl)); - - return parent::setIconUrl($iconUrl); - } - - /** - * {@inheritDoc} - */ - public function getIconUrl() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIconUrl', array()); - - return parent::getIconUrl(); - } - - /** - * {@inheritDoc} - */ - public function setBaseId($baseId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', array($baseId)); - - return parent::setBaseId($baseId); - } - - /** - * {@inheritDoc} - */ - public function getBaseId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', array()); - - return parent::getBaseId(); - } - - /** - * {@inheritDoc} - */ - public function setTitle($title) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', array($title)); - - return parent::setTitle($title); - } - - /** - * {@inheritDoc} - */ - public function getTitle() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', array()); - - return parent::getTitle(); - } - - /** - * {@inheritDoc} - */ - public function addPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addPublisher', array($publishers)); - - return parent::addPublisher($publishers); - } - - /** - * {@inheritDoc} - */ - public function removePublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removePublisher', array($publishers)); - - return parent::removePublisher($publishers); - } - - /** - * {@inheritDoc} - */ - public function getPublishers() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublishers', array()); - - return parent::getPublishers(); - } - - /** - * {@inheritDoc} - */ - public function addEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntry', array($entries)); - - return parent::addEntry($entries); - } - - /** - * {@inheritDoc} - */ - public function removeEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntry', array($entries)); - - return parent::removeEntry($entries); - } - - /** - * {@inheritDoc} - */ - public function getEntries($offset_start = 0, $how_many = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntries', array($offset_start, $how_many)); - - return parent::getEntries($offset_start, $how_many); - } - - /** - * {@inheritDoc} - */ - public function getOwner() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwner', array()); - - return parent::getOwner(); - } - - /** - * {@inheritDoc} - */ - public function isOwner(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isOwner', array($user)); - - return parent::isOwner($user); - } - - /** - * {@inheritDoc} - */ - public function getCollection(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', array($app)); - - return parent::getCollection($app); - } - - /** - * {@inheritDoc} - */ - public function setCollection(\collection $collection = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCollection', array($collection)); - - return parent::setCollection($collection); - } - - /** - * {@inheritDoc} - */ - public function setCreatedOn($createdOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', array($createdOn)); - - return parent::setCreatedOn($createdOn); - } - - /** - * {@inheritDoc} - */ - public function getCreatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', array()); - - return parent::getCreatedOn(); - } - - /** - * {@inheritDoc} - */ - public function setUpdatedOn($updatedOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', array($updatedOn)); - - return parent::setUpdatedOn($updatedOn); - } - - /** - * {@inheritDoc} - */ - public function getUpdatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', array()); - - return parent::getUpdatedOn(); - } - - /** - * {@inheritDoc} - */ - public function isPublisher(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublisher', array($user)); - - return parent::isPublisher($user); - } - - /** - * {@inheritDoc} - */ - public function getPublisher(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublisher', array($user)); - - return parent::getPublisher($user); - } - - /** - * {@inheritDoc} - */ - public function setSubtitle($subtitle) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubtitle', array($subtitle)); - - return parent::setSubtitle($subtitle); - } - - /** - * {@inheritDoc} - */ - public function getSubtitle() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubtitle', array()); - - return parent::getSubtitle(); - } - - /** - * {@inheritDoc} - */ - public function isAggregated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAggregated', array()); - - return parent::isAggregated(); - } - - /** - * {@inheritDoc} - */ - public function getCountTotalEntries() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCountTotalEntries', array()); - - return parent::getCountTotalEntries(); - } - - /** - * {@inheritDoc} - */ - public function hasAccess(\Alchemy\Phrasea\Model\Entities\User $user, \Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasAccess', array($user, $app)); - - return parent::hasAccess($user, $app); - } - - /** - * {@inheritDoc} - */ - public function addToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addToken', array($tokens)); - - return parent::addToken($tokens); - } - - /** - * {@inheritDoc} - */ - public function removeToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeToken', array($tokens)); - - return parent::removeToken($tokens); - } - - /** - * {@inheritDoc} - */ - public function getTokens() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTokens', array()); - - return parent::getTokens(); - } - - /** - * {@inheritDoc} - */ - public function addEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntrie', array($entries)); - - return parent::addEntrie($entries); - } - - /** - * {@inheritDoc} - */ - public function removeEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntrie', array($entries)); - - return parent::removeEntrie($entries); - } - - /** - * {@inheritDoc} - */ - public function hasPage($pageNumber, $nbEntriesByPage) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasPage', array($pageNumber, $nbEntriesByPage)); - - return parent::hasPage($pageNumber, $nbEntriesByPage); - } - - /** - * {@inheritDoc} - */ - public function isAccessible(\Alchemy\Phrasea\Model\Entities\User $user, \Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAccessible', array($user, $app)); - - return parent::isAccessible($user, $app); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php deleted file mode 100644 index 2155f48f67..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php +++ /dev/null @@ -1,422 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorEmail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'items', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'publisher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'feed'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'subtitle', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'authorEmail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'items', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'publisher', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedEntry' . "\0" . 'feed'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FeedEntry $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setTitle($title) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', array($title)); - - return parent::setTitle($title); - } - - /** - * {@inheritDoc} - */ - public function getTitle() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', array()); - - return parent::getTitle(); - } - - /** - * {@inheritDoc} - */ - public function setSubtitle($subtitle) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubtitle', array($subtitle)); - - return parent::setSubtitle($subtitle); - } - - /** - * {@inheritDoc} - */ - public function getSubtitle() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubtitle', array()); - - return parent::getSubtitle(); - } - - /** - * {@inheritDoc} - */ - public function setAuthorName($authorName) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAuthorName', array($authorName)); - - return parent::setAuthorName($authorName); - } - - /** - * {@inheritDoc} - */ - public function getAuthorName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAuthorName', array()); - - return parent::getAuthorName(); - } - - /** - * {@inheritDoc} - */ - public function setAuthorEmail($authorEmail) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAuthorEmail', array($authorEmail)); - - return parent::setAuthorEmail($authorEmail); - } - - /** - * {@inheritDoc} - */ - public function getAuthorEmail() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAuthorEmail', array()); - - return parent::getAuthorEmail(); - } - - /** - * {@inheritDoc} - */ - public function setCreatedOn($createdOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', array($createdOn)); - - return parent::setCreatedOn($createdOn); - } - - /** - * {@inheritDoc} - */ - public function getCreatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', array()); - - return parent::getCreatedOn(); - } - - /** - * {@inheritDoc} - */ - public function setUpdatedOn($updatedOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', array($updatedOn)); - - return parent::setUpdatedOn($updatedOn); - } - - /** - * {@inheritDoc} - */ - public function getUpdatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', array()); - - return parent::getUpdatedOn(); - } - - /** - * {@inheritDoc} - */ - public function addItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addItem', array($items)); - - return parent::addItem($items); - } - - /** - * {@inheritDoc} - */ - public function removeItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeItem', array($items)); - - return parent::removeItem($items); - } - - /** - * {@inheritDoc} - */ - public function getItems() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getItems', array()); - - return parent::getItems(); - } - - /** - * {@inheritDoc} - */ - public function setPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publisher = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPublisher', array($publisher)); - - return parent::setPublisher($publisher); - } - - /** - * {@inheritDoc} - */ - public function getPublisher() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPublisher', array()); - - return parent::getPublisher(); - } - - /** - * {@inheritDoc} - */ - public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFeed', array($feed)); - - return parent::setFeed($feed); - } - - /** - * {@inheritDoc} - */ - public function getFeed() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFeed', array()); - - return parent::getFeed(); - } - - /** - * {@inheritDoc} - */ - public function isPublisher(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPublisher', array($user)); - - return parent::isPublisher($user); - } - - /** - * {@inheritDoc} - */ - public function getItem($id) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getItem', array($id)); - - return parent::getItem($id); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php deleted file mode 100644 index b64d2d83a7..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php +++ /dev/null @@ -1,345 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'entry'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'ord', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'updatedOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedItem' . "\0" . 'entry'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FeedItem $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setRecordId($recordId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', array($recordId)); - - return parent::setRecordId($recordId); - } - - /** - * {@inheritDoc} - */ - public function getRecordId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', array()); - - return parent::getRecordId(); - } - - /** - * {@inheritDoc} - */ - public function setSbasId($sbasId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', array($sbasId)); - - return parent::setSbasId($sbasId); - } - - /** - * {@inheritDoc} - */ - public function getSbasId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', array()); - - return parent::getSbasId(); - } - - /** - * {@inheritDoc} - */ - public function setEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entry = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setEntry', array($entry)); - - return parent::setEntry($entry); - } - - /** - * {@inheritDoc} - */ - public function getEntry() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntry', array()); - - return parent::getEntry(); - } - - /** - * {@inheritDoc} - */ - public function setOrd($ord) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrd', array($ord)); - - return parent::setOrd($ord); - } - - /** - * {@inheritDoc} - */ - public function getOrd() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrd', array()); - - return parent::getOrd(); - } - - /** - * {@inheritDoc} - */ - public function setCreatedOn($createdOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', array($createdOn)); - - return parent::setCreatedOn($createdOn); - } - - /** - * {@inheritDoc} - */ - public function getCreatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', array()); - - return parent::getCreatedOn(); - } - - /** - * {@inheritDoc} - */ - public function setUpdatedOn($updatedOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdatedOn', array($updatedOn)); - - return parent::setUpdatedOn($updatedOn); - } - - /** - * {@inheritDoc} - */ - public function getUpdatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdatedOn', array()); - - return parent::getUpdatedOn(); - } - - /** - * {@inheritDoc} - */ - public function setLastInFeedItem() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastInFeedItem', array()); - - return parent::setLastInFeedItem(); - } - - /** - * {@inheritDoc} - */ - public function getRecord(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', array($app)); - - return parent::getRecord($app); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php deleted file mode 100644 index a1a4c9cc11..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php +++ /dev/null @@ -1,279 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'owner', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'feed'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'owner', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedPublisher' . "\0" . 'feed'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FeedPublisher $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setIsOwner($owner) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsOwner', array($owner)); - - return parent::setIsOwner($owner); - } - - /** - * {@inheritDoc} - */ - public function isOwner() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isOwner', array()); - - return parent::isOwner(); - } - - /** - * {@inheritDoc} - */ - public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFeed', array($feed)); - - return parent::setFeed($feed); - } - - /** - * {@inheritDoc} - */ - public function getFeed() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFeed', array()); - - return parent::getFeed(); - } - - /** - * {@inheritDoc} - */ - public function setCreatedOn($createdOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', array($createdOn)); - - return parent::setCreatedOn($createdOn); - } - - /** - * {@inheritDoc} - */ - public function getCreatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', array()); - - return parent::getCreatedOn(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php deleted file mode 100644 index ae7fbed674..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php +++ /dev/null @@ -1,257 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'feed'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FeedToken' . "\0" . 'feed'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FeedToken $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFeed', array($feed)); - - return parent::setFeed($feed); - } - - /** - * {@inheritDoc} - */ - public function getFeed() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFeed', array()); - - return parent::getFeed(); - } - - /** - * {@inheritDoc} - */ - public function setValue($value) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', array($value)); - - return parent::setValue($value); - } - - /** - * {@inheritDoc} - */ - public function getValue() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', array()); - - return parent::getValue(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php deleted file mode 100644 index 97edbbc390..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php +++ /dev/null @@ -1,433 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'active', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'password', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'receptionFolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'repositoryPrefixName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'passive', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'maxRetry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'active', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'password', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'receptionFolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'repositoryPrefixName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'passive', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'maxRetry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpCredential' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FtpCredential $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function isActive() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isActive', array()); - - return parent::isActive(); - } - - /** - * {@inheritDoc} - */ - public function setActive($active) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setActive', array($active)); - - return parent::setActive($active); - } - - /** - * {@inheritDoc} - */ - public function getAddress() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAddress', array()); - - return parent::getAddress(); - } - - /** - * {@inheritDoc} - */ - public function setAddress($address) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAddress', array($address)); - - return parent::setAddress($address); - } - - /** - * {@inheritDoc} - */ - public function getLogin() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLogin', array()); - - return parent::getLogin(); - } - - /** - * {@inheritDoc} - */ - public function setLogin($login) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogin', array($login)); - - return parent::setLogin($login); - } - - /** - * {@inheritDoc} - */ - public function getPassword() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPassword', array()); - - return parent::getPassword(); - } - - /** - * {@inheritDoc} - */ - public function setPassword($password) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassword', array($password)); - - return parent::setPassword($password); - } - - /** - * {@inheritDoc} - */ - public function getReceptionFolder() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getReceptionFolder', array()); - - return parent::getReceptionFolder(); - } - - /** - * {@inheritDoc} - */ - public function setReceptionFolder($receptionFolder) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setReceptionFolder', array($receptionFolder)); - - return parent::setReceptionFolder($receptionFolder); - } - - /** - * {@inheritDoc} - */ - public function getRepositoryPrefixName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRepositoryPrefixName', array()); - - return parent::getRepositoryPrefixName(); - } - - /** - * {@inheritDoc} - */ - public function setRepositoryPrefixName($repositoryPrefixName) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRepositoryPrefixName', array($repositoryPrefixName)); - - return parent::setRepositoryPrefixName($repositoryPrefixName); - } - - /** - * {@inheritDoc} - */ - public function isPassive() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPassive', array()); - - return parent::isPassive(); - } - - /** - * {@inheritDoc} - */ - public function setPassive($passive) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassive', array($passive)); - - return parent::setPassive($passive); - } - - /** - * {@inheritDoc} - */ - public function isSsl() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSsl', array()); - - return parent::isSsl(); - } - - /** - * {@inheritDoc} - */ - public function setSsl($ssl) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSsl', array($ssl)); - - return parent::setSsl($ssl); - } - - /** - * {@inheritDoc} - */ - public function getMaxRetry() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMaxRetry', array()); - - return parent::getMaxRetry(); - } - - /** - * {@inheritDoc} - */ - public function setMaxRetry($maxRetry) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMaxRetry', array($maxRetry)); - - return parent::setMaxRetry($maxRetry); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php deleted file mode 100644 index 80b18b5501..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php +++ /dev/null @@ -1,609 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'crash', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'nbretry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'mail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'addr', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'pwd', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'passif', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'destfolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'sendermail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailSender', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailReceiver', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'foldertocreate', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'logfile', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'crash', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'nbretry', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'mail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'addr', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'ssl', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'pwd', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'passif', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'destfolder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'sendermail', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailSender', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'textMailReceiver', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'foldertocreate', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'logfile', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExport' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FtpExport $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setCrash($crash) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCrash', array($crash)); - - return parent::setCrash($crash); - } - - /** - * {@inheritDoc} - */ - public function getCrash() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCrash', array()); - - return parent::getCrash(); - } - - /** - * {@inheritDoc} - */ - public function incrementCrash() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'incrementCrash', array()); - - return parent::incrementCrash(); - } - - /** - * {@inheritDoc} - */ - public function setNbretry($nbretry) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNbretry', array($nbretry)); - - return parent::setNbretry($nbretry); - } - - /** - * {@inheritDoc} - */ - public function getNbretry() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNbretry', array()); - - return parent::getNbretry(); - } - - /** - * {@inheritDoc} - */ - public function setMail($mail) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMail', array($mail)); - - return parent::setMail($mail); - } - - /** - * {@inheritDoc} - */ - public function getMail() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMail', array()); - - return parent::getMail(); - } - - /** - * {@inheritDoc} - */ - public function setAddr($addr) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAddr', array($addr)); - - return parent::setAddr($addr); - } - - /** - * {@inheritDoc} - */ - public function getAddr() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAddr', array()); - - return parent::getAddr(); - } - - /** - * {@inheritDoc} - */ - public function setSsl($ssl) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSsl', array($ssl)); - - return parent::setSsl($ssl); - } - - /** - * {@inheritDoc} - */ - public function isSsl() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSsl', array()); - - return parent::isSsl(); - } - - /** - * {@inheritDoc} - */ - public function setLogin($login) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogin', array($login)); - - return parent::setLogin($login); - } - - /** - * {@inheritDoc} - */ - public function getLogin() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLogin', array()); - - return parent::getLogin(); - } - - /** - * {@inheritDoc} - */ - public function setPwd($pwd) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPwd', array($pwd)); - - return parent::setPwd($pwd); - } - - /** - * {@inheritDoc} - */ - public function getPwd() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPwd', array()); - - return parent::getPwd(); - } - - /** - * {@inheritDoc} - */ - public function setPassif($passif) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassif', array($passif)); - - return parent::setPassif($passif); - } - - /** - * {@inheritDoc} - */ - public function isPassif() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPassif', array()); - - return parent::isPassif(); - } - - /** - * {@inheritDoc} - */ - public function setDestfolder($destfolder) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDestfolder', array($destfolder)); - - return parent::setDestfolder($destfolder); - } - - /** - * {@inheritDoc} - */ - public function getDestfolder() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDestfolder', array()); - - return parent::getDestfolder(); - } - - /** - * {@inheritDoc} - */ - public function setSendermail($sendermail) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSendermail', array($sendermail)); - - return parent::setSendermail($sendermail); - } - - /** - * {@inheritDoc} - */ - public function getSendermail() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSendermail', array()); - - return parent::getSendermail(); - } - - /** - * {@inheritDoc} - */ - public function setTextMailSender($textMailSender) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTextMailSender', array($textMailSender)); - - return parent::setTextMailSender($textMailSender); - } - - /** - * {@inheritDoc} - */ - public function getTextMailSender() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTextMailSender', array()); - - return parent::getTextMailSender(); - } - - /** - * {@inheritDoc} - */ - public function setTextMailReceiver($textMailReceiver) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTextMailReceiver', array($textMailReceiver)); - - return parent::setTextMailReceiver($textMailReceiver); - } - - /** - * {@inheritDoc} - */ - public function getTextMailReceiver() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTextMailReceiver', array()); - - return parent::getTextMailReceiver(); - } - - /** - * {@inheritDoc} - */ - public function setFoldertocreate($foldertocreate) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFoldertocreate', array($foldertocreate)); - - return parent::setFoldertocreate($foldertocreate); - } - - /** - * {@inheritDoc} - */ - public function getFoldertocreate() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFoldertocreate', array()); - - return parent::getFoldertocreate(); - } - - /** - * {@inheritDoc} - */ - public function setLogfile($logfile) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogfile', array($logfile)); - - return parent::setLogfile($logfile); - } - - /** - * {@inheritDoc} - */ - public function isLogfile() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isLogfile', array()); - - return parent::isLogfile(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function addElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', array($elements)); - - return parent::addElement($elements); - } - - /** - * {@inheritDoc} - */ - public function removeElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', array($elements)); - - return parent::removeElement($elements); - } - - /** - * {@inheritDoc} - */ - public function getElements() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', array()); - - return parent::getElements(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php deleted file mode 100644 index c495540671..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php +++ /dev/null @@ -1,433 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'subdef', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'folder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'error', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'done', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'export', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'businessfields', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'subdef', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'folder', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'error', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'done', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'export', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'businessfields', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\FtpExportElement' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (FtpExportElement $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setRecordId($recordId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', array($recordId)); - - return parent::setRecordId($recordId); - } - - /** - * {@inheritDoc} - */ - public function getRecordId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', array()); - - return parent::getRecordId(); - } - - /** - * {@inheritDoc} - */ - public function setBaseId($baseId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', array($baseId)); - - return parent::setBaseId($baseId); - } - - /** - * {@inheritDoc} - */ - public function getBaseId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', array()); - - return parent::getBaseId(); - } - - /** - * {@inheritDoc} - */ - public function setSubdef($subdef) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSubdef', array($subdef)); - - return parent::setSubdef($subdef); - } - - /** - * {@inheritDoc} - */ - public function getSubdef() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSubdef', array()); - - return parent::getSubdef(); - } - - /** - * {@inheritDoc} - */ - public function setFilename($filename) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFilename', array($filename)); - - return parent::setFilename($filename); - } - - /** - * {@inheritDoc} - */ - public function getFilename() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFilename', array()); - - return parent::getFilename(); - } - - /** - * {@inheritDoc} - */ - public function setFolder($folder) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFolder', array($folder)); - - return parent::setFolder($folder); - } - - /** - * {@inheritDoc} - */ - public function getFolder() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFolder', array()); - - return parent::getFolder(); - } - - /** - * {@inheritDoc} - */ - public function setError($error) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setError', array($error)); - - return parent::setError($error); - } - - /** - * {@inheritDoc} - */ - public function isError() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isError', array()); - - return parent::isError(); - } - - /** - * {@inheritDoc} - */ - public function setDone($done) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDone', array($done)); - - return parent::setDone($done); - } - - /** - * {@inheritDoc} - */ - public function isDone() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isDone', array()); - - return parent::isDone(); - } - - /** - * {@inheritDoc} - */ - public function setBusinessfields($businessfields) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBusinessfields', array($businessfields)); - - return parent::setBusinessfields($businessfields); - } - - /** - * {@inheritDoc} - */ - public function isBusinessfields() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isBusinessfields', array()); - - return parent::isBusinessfields(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setExport(\Alchemy\Phrasea\Model\Entities\FtpExport $export = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExport', array($export)); - - return parent::setExport($export); - } - - /** - * {@inheritDoc} - */ - public function getExport() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExport', array()); - - return parent::getExport(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php deleted file mode 100644 index dca6ef0961..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'lazaretFile'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute' . "\0" . 'lazaretFile'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (LazaretAttribute $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', array($name)); - - return parent::setName($name); - } - - /** - * {@inheritDoc} - */ - public function getName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', array()); - - return parent::getName(); - } - - /** - * {@inheritDoc} - */ - public function setValue($value) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', array($value)); - - return parent::setValue($value); - } - - /** - * {@inheritDoc} - */ - public function getValue() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', array()); - - return parent::getValue(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLazaretFile', array($lazaretFile)); - - return parent::setLazaretFile($lazaretFile); - } - - /** - * {@inheritDoc} - */ - public function getLazaretFile() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLazaretFile', array()); - - return parent::getLazaretFile(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php deleted file mode 100644 index d3ccaa6a1e..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php +++ /dev/null @@ -1,246 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'checkClassname', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'lazaretFile'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'checkClassname', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck' . "\0" . 'lazaretFile'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (LazaretCheck $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setCheckClassname($checkClassname) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCheckClassname', array($checkClassname)); - - return parent::setCheckClassname($checkClassname); - } - - /** - * {@inheritDoc} - */ - public function getCheckClassname() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCheckClassname', array()); - - return parent::getCheckClassname(); - } - - /** - * {@inheritDoc} - */ - public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLazaretFile', array($lazaretFile)); - - return parent::setLazaretFile($lazaretFile); - } - - /** - * {@inheritDoc} - */ - public function getLazaretFile() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLazaretFile', array()); - - return parent::getLazaretFile(); - } - - /** - * {@inheritDoc} - */ - public function getMessage(\Symfony\Component\Translation\TranslatorInterface $translator) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getMessage', array($translator)); - - return parent::getMessage($translator); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php deleted file mode 100644 index b053209aa2..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php +++ /dev/null @@ -1,499 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'thumbFilename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'originalName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'base_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'uuid', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'sha256', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'forced', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'attributes', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'checks', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'session'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'filename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'thumbFilename', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'originalName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'base_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'uuid', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'sha256', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'forced', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'attributes', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'checks', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile' . "\0" . 'session'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (LazaretFile $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setFilename($filename) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFilename', array($filename)); - - return parent::setFilename($filename); - } - - /** - * {@inheritDoc} - */ - public function getFilename() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFilename', array()); - - return parent::getFilename(); - } - - /** - * {@inheritDoc} - */ - public function setThumbFilename($thumbFilename) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setThumbFilename', array($thumbFilename)); - - return parent::setThumbFilename($thumbFilename); - } - - /** - * {@inheritDoc} - */ - public function getThumbFilename() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getThumbFilename', array()); - - return parent::getThumbFilename(); - } - - /** - * {@inheritDoc} - */ - public function setOriginalName($originalName) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOriginalName', array($originalName)); - - return parent::setOriginalName($originalName); - } - - /** - * {@inheritDoc} - */ - public function getOriginalName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOriginalName', array()); - - return parent::getOriginalName(); - } - - /** - * {@inheritDoc} - */ - public function setBaseId($baseId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', array($baseId)); - - return parent::setBaseId($baseId); - } - - /** - * {@inheritDoc} - */ - public function getBaseId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', array()); - - return parent::getBaseId(); - } - - /** - * {@inheritDoc} - */ - public function getCollection(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', array($app)); - - return parent::getCollection($app); - } - - /** - * {@inheritDoc} - */ - public function setUuid($uuid) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUuid', array($uuid)); - - return parent::setUuid($uuid); - } - - /** - * {@inheritDoc} - */ - public function getUuid() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUuid', array()); - - return parent::getUuid(); - } - - /** - * {@inheritDoc} - */ - public function setSha256($sha256) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSha256', array($sha256)); - - return parent::setSha256($sha256); - } - - /** - * {@inheritDoc} - */ - public function getSha256() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSha256', array()); - - return parent::getSha256(); - } - - /** - * {@inheritDoc} - */ - public function setForced($forced) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setForced', array($forced)); - - return parent::setForced($forced); - } - - /** - * {@inheritDoc} - */ - public function getForced() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getForced', array()); - - return parent::getForced(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function addAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addAttribute', array($attributes)); - - return parent::addAttribute($attributes); - } - - /** - * {@inheritDoc} - */ - public function removeAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeAttribute', array($attributes)); - - return parent::removeAttribute($attributes); - } - - /** - * {@inheritDoc} - */ - public function getAttributes() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAttributes', array()); - - return parent::getAttributes(); - } - - /** - * {@inheritDoc} - */ - public function addCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addCheck', array($checks)); - - return parent::addCheck($checks); - } - - /** - * {@inheritDoc} - */ - public function removeCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeCheck', array($checks)); - - return parent::removeCheck($checks); - } - - /** - * {@inheritDoc} - */ - public function getChecks() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getChecks', array()); - - return parent::getChecks(); - } - - /** - * {@inheritDoc} - */ - public function setSession(\Alchemy\Phrasea\Model\Entities\LazaretSession $session = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSession', array($session)); - - return parent::setSession($session); - } - - /** - * {@inheritDoc} - */ - public function getSession() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSession', array()); - - return parent::getSession(); - } - - /** - * {@inheritDoc} - */ - public function getRecordsToSubstitute(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordsToSubstitute', array($app)); - - return parent::getRecordsToSubstitute($app); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php deleted file mode 100644 index 5c92d3fa0a..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php +++ /dev/null @@ -1,290 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'files'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession' . "\0" . 'files'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (LazaretSession $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function addFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addFile', array($files)); - - return parent::addFile($files); - } - - /** - * {@inheritDoc} - */ - public function removeFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeFile', array($files)); - - return parent::removeFile($files); - } - - /** - * {@inheritDoc} - */ - public function getFiles() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFiles', array()); - - return parent::getFiles(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php deleted file mode 100644 index 3c5235fb6e..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php +++ /dev/null @@ -1,367 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Order $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setDeadline($deadline) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDeadline', array($deadline)); - - return parent::setDeadline($deadline); - } - - /** - * {@inheritDoc} - */ - public function getDeadline() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDeadline', array()); - - return parent::getDeadline(); - } - - /** - * {@inheritDoc} - */ - public function setCreatedOn($createdOn) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreatedOn', array($createdOn)); - - return parent::setCreatedOn($createdOn); - } - - /** - * {@inheritDoc} - */ - public function getCreatedOn() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreatedOn', array()); - - return parent::getCreatedOn(); - } - - /** - * {@inheritDoc} - */ - public function addElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addElement', array($elements)); - - return parent::addElement($elements); - } - - /** - * {@inheritDoc} - */ - public function removeElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeElement', array($elements)); - - return parent::removeElement($elements); - } - - /** - * {@inheritDoc} - */ - public function getElements() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getElements', array()); - - return parent::getElements(); - } - - /** - * {@inheritDoc} - */ - public function setTodo($todo) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTodo', array($todo)); - - return parent::setTodo($todo); - } - - /** - * {@inheritDoc} - */ - public function getTodo() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTodo', array()); - - return parent::getTodo(); - } - - /** - * {@inheritDoc} - */ - public function getTotal() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTotal', array()); - - return parent::getTotal(); - } - - /** - * {@inheritDoc} - */ - public function setOrderUsage($orderUsage) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrderUsage', array($orderUsage)); - - return parent::setOrderUsage($orderUsage); - } - - /** - * {@inheritDoc} - */ - public function getOrderUsage() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrderUsage', array()); - - return parent::getOrderUsage(); - } - - /** - * {@inheritDoc} - */ - public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', array($basket)); - - return parent::setBasket($basket); - } - - /** - * {@inheritDoc} - */ - public function getBasket() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', array()); - - return parent::getBasket(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php deleted file mode 100644 index 1151c3203b..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php +++ /dev/null @@ -1,323 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'orderMaster', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'deny', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'order'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'recordId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'orderMaster', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'deny', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\OrderElement' . "\0" . 'order'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (OrderElement $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setOrderMaster(\Alchemy\Phrasea\Model\Entities\User $user = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrderMaster', array($user)); - - return parent::setOrderMaster($user); - } - - /** - * {@inheritDoc} - */ - public function getOrderMaster() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrderMaster', array()); - - return parent::getOrderMaster(); - } - - /** - * {@inheritDoc} - */ - public function setDeny($deny) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDeny', array($deny)); - - return parent::setDeny($deny); - } - - /** - * {@inheritDoc} - */ - public function getDeny() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDeny', array()); - - return parent::getDeny(); - } - - /** - * {@inheritDoc} - */ - public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setOrder', array($order)); - - return parent::setOrder($order); - } - - /** - * {@inheritDoc} - */ - public function getOrder() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOrder', array()); - - return parent::getOrder(); - } - - /** - * {@inheritDoc} - */ - public function setBaseId($baseId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', array($baseId)); - - return parent::setBaseId($baseId); - } - - /** - * {@inheritDoc} - */ - public function getBaseId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', array()); - - return parent::getBaseId(); - } - - /** - * {@inheritDoc} - */ - public function setRecordId($recordId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', array($recordId)); - - return parent::setRecordId($recordId); - } - - /** - * {@inheritDoc} - */ - public function getRecordId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', array()); - - return parent::getRecordId(); - } - - /** - * {@inheritDoc} - */ - public function getRecord(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', array($app)); - - return parent::getRecord($app); - } - - /** - * {@inheritDoc} - */ - public function getSbasId(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', array($app)); - - return parent::getSbasId($app); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesPreset.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesPreset.php deleted file mode 100644 index 1e85e40535..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesPreset.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'created'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'sbasId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'title', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'data', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Preset' . "\0" . 'created'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Preset $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getSbasId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', array()); - - return parent::getSbasId(); - } - - /** - * {@inheritDoc} - */ - public function setSbasId($sbasId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', array($sbasId)); - - return parent::setSbasId($sbasId); - } - - /** - * {@inheritDoc} - */ - public function getTitle() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTitle', array()); - - return parent::getTitle(); - } - - /** - * {@inheritDoc} - */ - public function setTitle($title) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTitle', array($title)); - - return parent::setTitle($title); - } - - /** - * {@inheritDoc} - */ - public function setData(array $data) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setData', array($data)); - - return parent::setData($data); - } - - /** - * {@inheritDoc} - */ - public function getData() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getData', array()); - - return parent::getData(); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesRegistration.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesRegistration.php deleted file mode 100644 index 1e4c88e9a9..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesRegistration.php +++ /dev/null @@ -1,345 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'pending', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'rejected', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'baseId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'pending', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'rejected', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Registration' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Registration $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setPending($pending) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPending', array($pending)); - - return parent::setPending($pending); - } - - /** - * {@inheritDoc} - */ - public function isPending() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isPending', array()); - - return parent::isPending(); - } - - /** - * {@inheritDoc} - */ - public function setRejected($rejected) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRejected', array($rejected)); - - return parent::setRejected($rejected); - } - - /** - * {@inheritDoc} - */ - public function isRejected() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isRejected', array()); - - return parent::isRejected(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function getCollection(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCollection', array($app)); - - return parent::getCollection($app); - } - - /** - * {@inheritDoc} - */ - public function setCollection(\collection $collection) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCollection', array($collection)); - - return parent::setCollection($collection); - } - - /** - * {@inheritDoc} - */ - public function setBaseId($baseId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBaseId', array($baseId)); - - return parent::setBaseId($baseId); - } - - /** - * {@inheritDoc} - */ - public function getBaseId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBaseId', array()); - - return parent::getBaseId(); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesSession.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesSession.php deleted file mode 100644 index 78f1c1c231..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesSession.php +++ /dev/null @@ -1,510 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user_agent', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'ip_address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'platform', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_version', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_width', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_height', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'token', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'modules'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'user_agent', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'ip_address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'platform', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'browser_version', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_width', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'screen_height', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'token', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Session' . "\0" . 'modules'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Session $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setUserAgent($userAgent) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUserAgent', array($userAgent)); - - return parent::setUserAgent($userAgent); - } - - /** - * {@inheritDoc} - */ - public function getUserAgent() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUserAgent', array()); - - return parent::getUserAgent(); - } - - /** - * {@inheritDoc} - */ - public function setIpAddress($ipAddress) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIpAddress', array($ipAddress)); - - return parent::setIpAddress($ipAddress); - } - - /** - * {@inheritDoc} - */ - public function getIpAddress() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIpAddress', array()); - - return parent::getIpAddress(); - } - - /** - * {@inheritDoc} - */ - public function setPlatform($platform) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPlatform', array($platform)); - - return parent::setPlatform($platform); - } - - /** - * {@inheritDoc} - */ - public function getPlatform() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPlatform', array()); - - return parent::getPlatform(); - } - - /** - * {@inheritDoc} - */ - public function setBrowserName($browserName) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBrowserName', array($browserName)); - - return parent::setBrowserName($browserName); - } - - /** - * {@inheritDoc} - */ - public function getBrowserName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBrowserName', array()); - - return parent::getBrowserName(); - } - - /** - * {@inheritDoc} - */ - public function setBrowserVersion($browserVersion) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBrowserVersion', array($browserVersion)); - - return parent::setBrowserVersion($browserVersion); - } - - /** - * {@inheritDoc} - */ - public function getBrowserVersion() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBrowserVersion', array()); - - return parent::getBrowserVersion(); - } - - /** - * {@inheritDoc} - */ - public function setScreenWidth($screenWidth) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScreenWidth', array($screenWidth)); - - return parent::setScreenWidth($screenWidth); - } - - /** - * {@inheritDoc} - */ - public function getScreenWidth() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScreenWidth', array()); - - return parent::getScreenWidth(); - } - - /** - * {@inheritDoc} - */ - public function setScreenHeight($screenHeight) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setScreenHeight', array($screenHeight)); - - return parent::setScreenHeight($screenHeight); - } - - /** - * {@inheritDoc} - */ - public function getScreenHeight() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getScreenHeight', array()); - - return parent::getScreenHeight(); - } - - /** - * {@inheritDoc} - */ - public function setToken($token) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setToken', array($token)); - - return parent::setToken($token); - } - - /** - * {@inheritDoc} - */ - public function getToken() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getToken', array()); - - return parent::getToken(); - } - - /** - * {@inheritDoc} - */ - public function setNonce($nonce) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNonce', array($nonce)); - - return parent::setNonce($nonce); - } - - /** - * {@inheritDoc} - */ - public function getNonce() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNonce', array()); - - return parent::getNonce(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function addModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addModule', array($modules)); - - return parent::addModule($modules); - } - - /** - * {@inheritDoc} - */ - public function removeModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeModule', array($modules)); - - return parent::removeModule($modules); - } - - /** - * {@inheritDoc} - */ - public function getModules() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getModules', array()); - - return parent::getModules(); - } - - /** - * {@inheritDoc} - */ - public function getModuleById($moduleId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getModuleById', array($moduleId)); - - return parent::getModuleById($moduleId); - } - - /** - * {@inheritDoc} - */ - public function hasModuleId($moduleId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasModuleId', array($moduleId)); - - return parent::hasModuleId($moduleId); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php deleted file mode 100644 index 195e7c41da..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php +++ /dev/null @@ -1,279 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'module_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'session'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'module_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\SessionModule' . "\0" . 'session'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (SessionModule $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setModuleId($moduleId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setModuleId', array($moduleId)); - - return parent::setModuleId($moduleId); - } - - /** - * {@inheritDoc} - */ - public function getModuleId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getModuleId', array()); - - return parent::getModuleId(); - } - - /** - * {@inheritDoc} - */ - public function setCreated($created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setSession(\Alchemy\Phrasea\Model\Entities\Session $session = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSession', array($session)); - - return parent::setSession($session); - } - - /** - * {@inheritDoc} - */ - public function getSession() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSession', array()); - - return parent::getSession(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php deleted file mode 100644 index eec5e63468..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'created'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'sbas_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'record_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\StoryWZ' . "\0" . 'created'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (StoryWZ $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setSbasId($sbasId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSbasId', array($sbasId)); - - return parent::setSbasId($sbasId); - } - - /** - * {@inheritDoc} - */ - public function getSbasId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSbasId', array()); - - return parent::getSbasId(); - } - - /** - * {@inheritDoc} - */ - public function setRecordId($recordId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecordId', array($recordId)); - - return parent::setRecordId($recordId); - } - - /** - * {@inheritDoc} - */ - public function getRecordId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecordId', array()); - - return parent::getRecordId(); - } - - /** - * {@inheritDoc} - */ - public function getRecord(\Alchemy\Phrasea\Application $app) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRecord', array($app)); - - return parent::getRecord($app); - } - - /** - * {@inheritDoc} - */ - public function setRecord(\record_adapter $record) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRecord', array($record)); - - return parent::setRecord($record); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesTask.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesTask.php deleted file mode 100644 index 44d4aff1ac..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesTask.php +++ /dev/null @@ -1,433 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'jobId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'settings', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'completed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'status', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'crashed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'singleRun', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'lastExecution', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'period'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'jobId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'settings', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'completed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'status', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'crashed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'singleRun', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'lastExecution', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Task' . "\0" . 'period'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (Task $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', array($name)); - - return parent::setName($name); - } - - /** - * {@inheritDoc} - */ - public function getName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', array()); - - return parent::getName(); - } - - /** - * {@inheritDoc} - */ - public function setJobId($jobId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setJobId', array($jobId)); - - return parent::setJobId($jobId); - } - - /** - * {@inheritDoc} - */ - public function getJobId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getJobId', array()); - - return parent::getJobId(); - } - - /** - * {@inheritDoc} - */ - public function setSettings($settings) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSettings', array($settings)); - - return parent::setSettings($settings); - } - - /** - * {@inheritDoc} - */ - public function getSettings() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSettings', array()); - - return parent::getSettings(); - } - - /** - * {@inheritDoc} - */ - public function setCompleted($completed) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCompleted', array($completed)); - - return parent::setCompleted($completed); - } - - /** - * {@inheritDoc} - */ - public function isCompleted() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isCompleted', array()); - - return parent::isCompleted(); - } - - /** - * {@inheritDoc} - */ - public function setStatus($status) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setStatus', array($status)); - - return parent::setStatus($status); - } - - /** - * {@inheritDoc} - */ - public function getStatus() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getStatus', array()); - - return parent::getStatus(); - } - - /** - * {@inheritDoc} - */ - public function setCrashed($crashed) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCrashed', array($crashed)); - - return parent::setCrashed($crashed); - } - - /** - * {@inheritDoc} - */ - public function getCrashed() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCrashed', array()); - - return parent::getCrashed(); - } - - /** - * {@inheritDoc} - */ - public function setSingleRun($singleRun) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSingleRun', array($singleRun)); - - return parent::setSingleRun($singleRun); - } - - /** - * {@inheritDoc} - */ - public function isSingleRun() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSingleRun', array()); - - return parent::isSingleRun(); - } - - /** - * {@inheritDoc} - */ - public function setCreated($created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated($updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setExecuted($lastExecution) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExecuted', array($lastExecution)); - - return parent::setExecuted($lastExecution); - } - - /** - * {@inheritDoc} - */ - public function getLastExecution() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastExecution', array()); - - return parent::getLastExecution(); - } - - /** - * {@inheritDoc} - */ - public function getPeriod() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPeriod', array()); - - return parent::getPeriod(); - } - - /** - * {@inheritDoc} - */ - public function setPeriod($period) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPeriod', array($period)); - - return parent::setPeriod($period); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUser.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUser.php deleted file mode 100644 index 245a37fcf6..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUser.php +++ /dev/null @@ -1,1082 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'email', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'password', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'saltedPassword', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'firstName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'lastName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'gender', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'city', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'country', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'zipCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'geonameId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'locale', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'timezone', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'job', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'activity', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'company', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'phone', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'fax', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'admin', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'guest', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'mailNotificationsActivated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'requestNotificationsActivated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'ldapCreated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'lastAppliedTemplate', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'pushList', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'canChangeProfil', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'canChangeFtpProfil', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'lastConnection', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'mailLocked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'deleted', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'templateOwner', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'ftpCredential', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'queries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'settings', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'notificationSettings'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'login', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'email', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'password', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'nonce', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'saltedPassword', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'firstName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'lastName', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'gender', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'address', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'city', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'country', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'zipCode', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'geonameId', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'locale', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'timezone', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'job', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'activity', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'company', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'phone', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'fax', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'admin', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'guest', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'mailNotificationsActivated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'requestNotificationsActivated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'ldapCreated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'lastAppliedTemplate', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'pushList', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'canChangeProfil', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'canChangeFtpProfil', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'lastConnection', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'mailLocked', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'deleted', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'templateOwner', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'ftpCredential', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'queries', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'settings', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\User' . "\0" . 'notificationSettings'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (User $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function getLogin() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLogin', array()); - - return parent::getLogin(); - } - - /** - * {@inheritDoc} - */ - public function setLogin($login) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLogin', array($login)); - - return parent::setLogin($login); - } - - /** - * {@inheritDoc} - */ - public function getEmail() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEmail', array()); - - return parent::getEmail(); - } - - /** - * {@inheritDoc} - */ - public function setEmail($email) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setEmail', array($email)); - - return parent::setEmail($email); - } - - /** - * {@inheritDoc} - */ - public function getPassword() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPassword', array()); - - return parent::getPassword(); - } - - /** - * {@inheritDoc} - */ - public function setPassword($password) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPassword', array($password)); - - return parent::setPassword($password); - } - - /** - * {@inheritDoc} - */ - public function getNonce() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNonce', array()); - - return parent::getNonce(); - } - - /** - * {@inheritDoc} - */ - public function setNonce($nonce) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNonce', array($nonce)); - - return parent::setNonce($nonce); - } - - /** - * {@inheritDoc} - */ - public function isSaltedPassword() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSaltedPassword', array()); - - return parent::isSaltedPassword(); - } - - /** - * {@inheritDoc} - */ - public function setSaltedPassword($saltedPassword) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSaltedPassword', array($saltedPassword)); - - return parent::setSaltedPassword($saltedPassword); - } - - /** - * {@inheritDoc} - */ - public function getFirstName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFirstName', array()); - - return parent::getFirstName(); - } - - /** - * {@inheritDoc} - */ - public function setFirstName($firstName) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFirstName', array($firstName)); - - return parent::setFirstName($firstName); - } - - /** - * {@inheritDoc} - */ - public function getLastName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastName', array()); - - return parent::getLastName(); - } - - /** - * {@inheritDoc} - */ - public function setLastName($lastName) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastName', array($lastName)); - - return parent::setLastName($lastName); - } - - /** - * {@inheritDoc} - */ - public function getGender() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getGender', array()); - - return parent::getGender(); - } - - /** - * {@inheritDoc} - */ - public function setGender($gender) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGender', array($gender)); - - return parent::setGender($gender); - } - - /** - * {@inheritDoc} - */ - public function getAddress() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAddress', array()); - - return parent::getAddress(); - } - - /** - * {@inheritDoc} - */ - public function setAddress($address) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAddress', array($address)); - - return parent::setAddress($address); - } - - /** - * {@inheritDoc} - */ - public function getCity() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCity', array()); - - return parent::getCity(); - } - - /** - * {@inheritDoc} - */ - public function setCity($city) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCity', array($city)); - - return parent::setCity($city); - } - - /** - * {@inheritDoc} - */ - public function getCountry() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCountry', array()); - - return parent::getCountry(); - } - - /** - * {@inheritDoc} - */ - public function setCountry($country) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCountry', array($country)); - - return parent::setCountry($country); - } - - /** - * {@inheritDoc} - */ - public function getZipCode() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getZipCode', array()); - - return parent::getZipCode(); - } - - /** - * {@inheritDoc} - */ - public function setZipCode($zipCode) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setZipCode', array($zipCode)); - - return parent::setZipCode($zipCode); - } - - /** - * {@inheritDoc} - */ - public function getGeonameId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getGeonameId', array()); - - return parent::getGeonameId(); - } - - /** - * {@inheritDoc} - */ - public function setGeonameId($geonameId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGeonameId', array($geonameId)); - - return parent::setGeonameId($geonameId); - } - - /** - * {@inheritDoc} - */ - public function getLocale() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLocale', array()); - - return parent::getLocale(); - } - - /** - * {@inheritDoc} - */ - public function setLocale($locale) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLocale', array($locale)); - - return parent::setLocale($locale); - } - - /** - * {@inheritDoc} - */ - public function getTimezone() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTimezone', array()); - - return parent::getTimezone(); - } - - /** - * {@inheritDoc} - */ - public function setTimezone($timezone) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTimezone', array($timezone)); - - return parent::setTimezone($timezone); - } - - /** - * {@inheritDoc} - */ - public function getJob() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getJob', array()); - - return parent::getJob(); - } - - /** - * {@inheritDoc} - */ - public function setJob($job) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setJob', array($job)); - - return parent::setJob($job); - } - - /** - * {@inheritDoc} - */ - public function getActivity() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getActivity', array()); - - return parent::getActivity(); - } - - /** - * {@inheritDoc} - */ - public function setActivity($activity) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setActivity', array($activity)); - - return parent::setActivity($activity); - } - - /** - * {@inheritDoc} - */ - public function getCompany() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCompany', array()); - - return parent::getCompany(); - } - - /** - * {@inheritDoc} - */ - public function setCompany($company) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCompany', array($company)); - - return parent::setCompany($company); - } - - /** - * {@inheritDoc} - */ - public function getPhone() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPhone', array()); - - return parent::getPhone(); - } - - /** - * {@inheritDoc} - */ - public function setPhone($phone) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPhone', array($phone)); - - return parent::setPhone($phone); - } - - /** - * {@inheritDoc} - */ - public function getFax() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFax', array()); - - return parent::getFax(); - } - - /** - * {@inheritDoc} - */ - public function setFax($fax) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFax', array($fax)); - - return parent::setFax($fax); - } - - /** - * {@inheritDoc} - */ - public function isAdmin() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isAdmin', array()); - - return parent::isAdmin(); - } - - /** - * {@inheritDoc} - */ - public function setAdmin($admin) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAdmin', array($admin)); - - return parent::setAdmin($admin); - } - - /** - * {@inheritDoc} - */ - public function isGuest() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isGuest', array()); - - return parent::isGuest(); - } - - /** - * {@inheritDoc} - */ - public function setGuest($guest) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setGuest', array($guest)); - - return parent::setGuest($guest); - } - - /** - * {@inheritDoc} - */ - public function hasMailNotificationsActivated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasMailNotificationsActivated', array()); - - return parent::hasMailNotificationsActivated(); - } - - /** - * {@inheritDoc} - */ - public function setMailNotificationsActivated($mailNotifications) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMailNotificationsActivated', array($mailNotifications)); - - return parent::setMailNotificationsActivated($mailNotifications); - } - - /** - * {@inheritDoc} - */ - public function hasRequestNotificationsActivated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasRequestNotificationsActivated', array()); - - return parent::hasRequestNotificationsActivated(); - } - - /** - * {@inheritDoc} - */ - public function setRequestNotificationsActivated($requestNotifications) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRequestNotificationsActivated', array($requestNotifications)); - - return parent::setRequestNotificationsActivated($requestNotifications); - } - - /** - * {@inheritDoc} - */ - public function hasLdapCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasLdapCreated', array()); - - return parent::hasLdapCreated(); - } - - /** - * {@inheritDoc} - */ - public function setLdapCreated($ldapCreated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLdapCreated', array($ldapCreated)); - - return parent::setLdapCreated($ldapCreated); - } - - /** - * {@inheritDoc} - */ - public function getTemplateOwner() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getTemplateOwner', array()); - - return parent::getTemplateOwner(); - } - - /** - * {@inheritDoc} - */ - public function setTemplateOwner(\Alchemy\Phrasea\Model\Entities\User $owner) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setTemplateOwner', array($owner)); - - return parent::setTemplateOwner($owner); - } - - /** - * {@inheritDoc} - */ - public function getLastAppliedTemplate() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastAppliedTemplate', array()); - - return parent::getLastAppliedTemplate(); - } - - /** - * {@inheritDoc} - */ - public function setLastAppliedTemplate(\Alchemy\Phrasea\Model\Entities\User $lastAppliedTemplate) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastAppliedTemplate', array($lastAppliedTemplate)); - - return parent::setLastAppliedTemplate($lastAppliedTemplate); - } - - /** - * {@inheritDoc} - */ - public function getPushList() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getPushList', array()); - - return parent::getPushList(); - } - - /** - * {@inheritDoc} - */ - public function setPushList($pushList) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setPushList', array($pushList)); - - return parent::setPushList($pushList); - } - - /** - * {@inheritDoc} - */ - public function canChangeProfil() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'canChangeProfil', array()); - - return parent::canChangeProfil(); - } - - /** - * {@inheritDoc} - */ - public function setCanChangeProfil($canChangeProfil) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanChangeProfil', array($canChangeProfil)); - - return parent::setCanChangeProfil($canChangeProfil); - } - - /** - * {@inheritDoc} - */ - public function canChangeFtpProfil() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'canChangeFtpProfil', array()); - - return parent::canChangeFtpProfil(); - } - - /** - * {@inheritDoc} - */ - public function setCanChangeFtpProfil($canChangeFtpProfil) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanChangeFtpProfil', array($canChangeFtpProfil)); - - return parent::setCanChangeFtpProfil($canChangeFtpProfil); - } - - /** - * {@inheritDoc} - */ - public function getLastConnection() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getLastConnection', array()); - - return parent::getLastConnection(); - } - - /** - * {@inheritDoc} - */ - public function setLastConnection(\DateTime $lastConnection) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setLastConnection', array($lastConnection)); - - return parent::setLastConnection($lastConnection); - } - - /** - * {@inheritDoc} - */ - public function isMailLocked() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isMailLocked', array()); - - return parent::isMailLocked(); - } - - /** - * {@inheritDoc} - */ - public function setMailLocked($mailLocked) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setMailLocked', array($mailLocked)); - - return parent::setMailLocked($mailLocked); - } - - /** - * {@inheritDoc} - */ - public function isDeleted() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isDeleted', array()); - - return parent::isDeleted(); - } - - /** - * {@inheritDoc} - */ - public function setDeleted($deleted) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDeleted', array($deleted)); - - return parent::setDeleted($deleted); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getFtpCredential() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFtpCredential', array()); - - return parent::getFtpCredential(); - } - - /** - * {@inheritDoc} - */ - public function setFtpCredential(\Alchemy\Phrasea\Model\Entities\FtpCredential $ftpCredential = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFtpCredential', array($ftpCredential)); - - return parent::setFtpCredential($ftpCredential); - } - - /** - * {@inheritDoc} - */ - public function getQueries() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getQueries', array()); - - return parent::getQueries(); - } - - /** - * {@inheritDoc} - */ - public function addQuery(\Alchemy\Phrasea\Model\Entities\UserQuery $query) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addQuery', array($query)); - - return parent::addQuery($query); - } - - /** - * {@inheritDoc} - */ - public function getSettings() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSettings', array()); - - return parent::getSettings(); - } - - /** - * {@inheritDoc} - */ - public function addSetting(\Alchemy\Phrasea\Model\Entities\UserSetting $setting) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addSetting', array($setting)); - - return parent::addSetting($setting); - } - - /** - * {@inheritDoc} - */ - public function getNotificationSettings() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNotificationSettings', array()); - - return parent::getNotificationSettings(); - } - - /** - * {@inheritDoc} - */ - public function addNotificationSettings(\Alchemy\Phrasea\Model\Entities\UserNotificationSetting $notificationSetting) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addNotificationSettings', array($notificationSetting)); - - return parent::addNotificationSettings($notificationSetting); - } - - /** - * {@inheritDoc} - */ - public function isTemplate() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isTemplate', array()); - - return parent::isTemplate(); - } - - /** - * {@inheritDoc} - */ - public function isSpecial() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isSpecial', array()); - - return parent::isSpecial(); - } - - /** - * {@inheritDoc} - */ - public function getDisplayName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDisplayName', array()); - - return parent::getDisplayName(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserNotificationSetting.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserNotificationSetting.php deleted file mode 100644 index 3ee60b8771..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserNotificationSetting.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserNotificationSetting' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UserNotificationSetting $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', array()); - - return parent::getName(); - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', array($name)); - - return parent::setName($name); - } - - /** - * {@inheritDoc} - */ - public function getValue() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', array()); - - return parent::getValue(); - } - - /** - * {@inheritDoc} - */ - public function setValue($value) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', array($value)); - - return parent::setValue($value); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated($updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserQuery.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserQuery.php deleted file mode 100644 index 6cf86564c9..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserQuery.php +++ /dev/null @@ -1,257 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'query', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'created'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'query', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserQuery' . "\0" . 'created'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UserQuery $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getQuery() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getQuery', array()); - - return parent::getQuery(); - } - - /** - * {@inheritDoc} - */ - public function setQuery($query) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setQuery', array($query)); - - return parent::setQuery($query); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserSetting.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserSetting.php deleted file mode 100644 index 3bf3688b84..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUserSetting.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'value', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UserSetting' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UserSetting $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', array()); - - return parent::getName(); - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', array($name)); - - return parent::setName($name); - } - - /** - * {@inheritDoc} - */ - public function getValue() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValue', array()); - - return parent::getValue(); - } - - /** - * {@inheritDoc} - */ - public function setValue($value) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setValue', array($value)); - - return parent::setValue($value); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrAuthProvider.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrAuthProvider.php deleted file mode 100644 index 98431f8d0a..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrAuthProvider.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'provider', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'distant_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'updated'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'provider', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'distant_id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrAuthProvider' . "\0" . 'updated'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UsrAuthProvider $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setProvider($provider) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setProvider', array($provider)); - - return parent::setProvider($provider); - } - - /** - * {@inheritDoc} - */ - public function getProvider() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getProvider', array()); - - return parent::getProvider(); - } - - /** - * {@inheritDoc} - */ - public function setDistantId($distantId) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDistantId', array($distantId)); - - return parent::setDistantId($distantId); - } - - /** - * {@inheritDoc} - */ - public function getDistantId() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDistantId', array()); - - return parent::getDistantId(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrList.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrList.php deleted file mode 100644 index e65c2d1aab..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrList.php +++ /dev/null @@ -1,356 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'owners', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'entries'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'name', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'owners', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrList' . "\0" . 'entries'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UsrList $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setName', array($name)); - - return parent::setName($name); - } - - /** - * {@inheritDoc} - */ - public function getName() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getName', array()); - - return parent::getName(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function addOwner(\Alchemy\Phrasea\Model\Entities\UsrListOwner $owners) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addOwner', array($owners)); - - return parent::addOwner($owners); - } - - /** - * {@inheritDoc} - */ - public function removeOwner(\Alchemy\Phrasea\Model\Entities\UsrListOwner $owners) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeOwner', array($owners)); - - return parent::removeOwner($owners); - } - - /** - * {@inheritDoc} - */ - public function getOwners() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwners', array()); - - return parent::getOwners(); - } - - /** - * {@inheritDoc} - */ - public function addEntrie(\Alchemy\Phrasea\Model\Entities\UsrListEntry $entries) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addEntrie', array($entries)); - - return parent::addEntrie($entries); - } - - /** - * {@inheritDoc} - */ - public function removeEntrie(\Alchemy\Phrasea\Model\Entities\UsrListEntry $entries) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeEntrie', array($entries)); - - return parent::removeEntrie($entries); - } - - /** - * {@inheritDoc} - */ - public function getEntries() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEntries', array()); - - return parent::getEntries(); - } - - /** - * {@inheritDoc} - */ - public function hasAccess(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'hasAccess', array($user)); - - return parent::hasAccess($user); - } - - /** - * {@inheritDoc} - */ - public function getOwner(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getOwner', array($user)); - - return parent::getOwner($user); - } - - /** - * {@inheritDoc} - */ - public function has(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'has', array($user)); - - return parent::has($user); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrListEntry.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrListEntry.php deleted file mode 100644 index 5ee900ed1c..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrListEntry.php +++ /dev/null @@ -1,279 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'list'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListEntry' . "\0" . 'list'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UsrListEntry $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setList(\Alchemy\Phrasea\Model\Entities\UsrList $list = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setList', array($list)); - - return parent::setList($list); - } - - /** - * {@inheritDoc} - */ - public function getList() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getList', array()); - - return parent::getList(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrListOwner.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrListOwner.php deleted file mode 100644 index ffd2458706..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesUsrListOwner.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'role', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'list'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'role', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner' . "\0" . 'list'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (UsrListOwner $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setRole($role) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setRole', array($role)); - - return parent::setRole($role); - } - - /** - * {@inheritDoc} - */ - public function getRole() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getRole', array()); - - return parent::getRole(); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setList(\Alchemy\Phrasea\Model\Entities\UsrList $list = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setList', array($list)); - - return parent::setList($list); - } - - /** - * {@inheritDoc} - */ - public function getList() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getList', array()); - - return parent::getList(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationData.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationData.php deleted file mode 100644 index 7709cecc84..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationData.php +++ /dev/null @@ -1,301 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'agreement', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'note', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'participant', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'basket_element'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'agreement', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'note', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'participant', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationData' . "\0" . 'basket_element'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (ValidationData $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setAgreement($agreement) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAgreement', array($agreement)); - - return parent::setAgreement($agreement); - } - - /** - * {@inheritDoc} - */ - public function getAgreement() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAgreement', array()); - - return parent::getAgreement(); - } - - /** - * {@inheritDoc} - */ - public function setNote($note) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setNote', array($note)); - - return parent::setNote($note); - } - - /** - * {@inheritDoc} - */ - public function getNote() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getNote', array()); - - return parent::getNote(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participant = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setParticipant', array($participant)); - - return parent::setParticipant($participant); - } - - /** - * {@inheritDoc} - */ - public function getParticipant() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getParticipant', array()); - - return parent::getParticipant(); - } - - /** - * {@inheritDoc} - */ - public function setBasketElement(\Alchemy\Phrasea\Model\Entities\BasketElement $basketElement = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasketElement', array($basketElement)); - - return parent::setBasketElement($basketElement); - } - - /** - * {@inheritDoc} - */ - public function getBasketElement() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasketElement', array()); - - return parent::getBasketElement(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationParticipant.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationParticipant.php deleted file mode 100644 index d22e522d75..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationParticipant.php +++ /dev/null @@ -1,389 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_aware', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_confirmed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_agree', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_see_others', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'reminded', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'session', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'user'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_aware', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'is_confirmed', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_agree', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'can_see_others', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'reminded', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'datas', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'session', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationParticipant' . "\0" . 'user'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (ValidationParticipant $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setUser(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUser', array($user)); - - return parent::setUser($user); - } - - /** - * {@inheritDoc} - */ - public function getUser() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUser', array()); - - return parent::getUser(); - } - - /** - * {@inheritDoc} - */ - public function setIsAware($isAware) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsAware', array($isAware)); - - return parent::setIsAware($isAware); - } - - /** - * {@inheritDoc} - */ - public function getIsAware() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIsAware', array()); - - return parent::getIsAware(); - } - - /** - * {@inheritDoc} - */ - public function setIsConfirmed($isConfirmed) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setIsConfirmed', array($isConfirmed)); - - return parent::setIsConfirmed($isConfirmed); - } - - /** - * {@inheritDoc} - */ - public function getIsConfirmed() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getIsConfirmed', array()); - - return parent::getIsConfirmed(); - } - - /** - * {@inheritDoc} - */ - public function setCanAgree($canAgree) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanAgree', array($canAgree)); - - return parent::setCanAgree($canAgree); - } - - /** - * {@inheritDoc} - */ - public function getCanAgree() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanAgree', array()); - - return parent::getCanAgree(); - } - - /** - * {@inheritDoc} - */ - public function setCanSeeOthers($canSeeOthers) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanSeeOthers', array($canSeeOthers)); - - return parent::setCanSeeOthers($canSeeOthers); - } - - /** - * {@inheritDoc} - */ - public function getCanSeeOthers() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanSeeOthers', array()); - - return parent::getCanSeeOthers(); - } - - /** - * {@inheritDoc} - */ - public function setReminded($reminded) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setReminded', array($reminded)); - - return parent::setReminded($reminded); - } - - /** - * {@inheritDoc} - */ - public function getReminded() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getReminded', array()); - - return parent::getReminded(); - } - - /** - * {@inheritDoc} - */ - public function addData(\Alchemy\Phrasea\Model\Entities\ValidationData $datas) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addData', array($datas)); - - return parent::addData($datas); - } - - /** - * {@inheritDoc} - */ - public function removeData(\Alchemy\Phrasea\Model\Entities\ValidationData $datas) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeData', array($datas)); - - return parent::removeData($datas); - } - - /** - * {@inheritDoc} - */ - public function getDatas() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDatas', array()); - - return parent::getDatas(); - } - - /** - * {@inheritDoc} - */ - public function setSession(\Alchemy\Phrasea\Model\Entities\ValidationSession $session = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSession', array($session)); - - return parent::setSession($session); - } - - /** - * {@inheritDoc} - */ - public function getSession() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSession', array()); - - return parent::getSession(); - } - - /** - * {@inheritDoc} - */ - public function isReleasable() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isReleasable', array()); - - return parent::isReleasable(); - } - -} diff --git a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationSession.php b/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationSession.php deleted file mode 100644 index 2efb811e07..0000000000 --- a/tmp/doctrine-proxies/__CG__AlchemyPhraseaModelEntitiesValidationSession.php +++ /dev/null @@ -1,378 +0,0 @@ -__initializer__ = $initializer; - $this->__cloner__ = $cloner; - } - - - - - - - - /** - * - * @return array - */ - public function __sleep() - { - if ($this->__isInitialized__) { - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'initiator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'participants'); - } - - return array('__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'initiator', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'created', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'updated', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'expires', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\ValidationSession' . "\0" . 'participants'); - } - - /** - * - */ - public function __wakeup() - { - if ( ! $this->__isInitialized__) { - $this->__initializer__ = function (ValidationSession $proxy) { - $proxy->__setInitializer(null); - $proxy->__setCloner(null); - - $existingProperties = get_object_vars($proxy); - - foreach ($proxy->__getLazyProperties() as $property => $defaultValue) { - if ( ! array_key_exists($property, $existingProperties)) { - $proxy->$property = $defaultValue; - } - } - }; - - } - } - - /** - * - */ - public function __clone() - { - $this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', array()); - } - - /** - * Forces initialization of the proxy - */ - public function __load() - { - $this->__initializer__ && $this->__initializer__->__invoke($this, '__load', array()); - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitialized($initialized) - { - $this->__isInitialized__ = $initialized; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setInitializer(\Closure $initializer = null) - { - $this->__initializer__ = $initializer; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __getInitializer() - { - return $this->__initializer__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - */ - public function __setCloner(\Closure $cloner = null) - { - $this->__cloner__ = $cloner; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific cloning logic - */ - public function __getCloner() - { - return $this->__cloner__; - } - - /** - * {@inheritDoc} - * @internal generated method: use only when explicitly handling proxy specific loading logic - * @static - */ - public function __getLazyProperties() - { - return self::$lazyPropertiesDefaults; - } - - - /** - * {@inheritDoc} - */ - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) parent::getId(); - } - - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getId', array()); - - return parent::getId(); - } - - /** - * {@inheritDoc} - */ - public function setInitiator(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setInitiator', array($user)); - - return parent::setInitiator($user); - } - - /** - * {@inheritDoc} - */ - public function getInitiator() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getInitiator', array()); - - return parent::getInitiator(); - } - - /** - * {@inheritDoc} - */ - public function isInitiator(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isInitiator', array($user)); - - return parent::isInitiator($user); - } - - /** - * {@inheritDoc} - */ - public function setCreated(\DateTime $created) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCreated', array($created)); - - return parent::setCreated($created); - } - - /** - * {@inheritDoc} - */ - public function getCreated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCreated', array()); - - return parent::getCreated(); - } - - /** - * {@inheritDoc} - */ - public function setUpdated(\DateTime $updated) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setUpdated', array($updated)); - - return parent::setUpdated($updated); - } - - /** - * {@inheritDoc} - */ - public function getUpdated() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getUpdated', array()); - - return parent::getUpdated(); - } - - /** - * {@inheritDoc} - */ - public function setExpires($expires) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setExpires', array($expires)); - - return parent::setExpires($expires); - } - - /** - * {@inheritDoc} - */ - public function getExpires() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getExpires', array()); - - return parent::getExpires(); - } - - /** - * {@inheritDoc} - */ - public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'setBasket', array($basket)); - - return parent::setBasket($basket); - } - - /** - * {@inheritDoc} - */ - public function getBasket() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getBasket', array()); - - return parent::getBasket(); - } - - /** - * {@inheritDoc} - */ - public function addParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participants) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'addParticipant', array($participants)); - - return parent::addParticipant($participants); - } - - /** - * {@inheritDoc} - */ - public function removeParticipant(\Alchemy\Phrasea\Model\Entities\ValidationParticipant $participants) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'removeParticipant', array($participants)); - - return parent::removeParticipant($participants); - } - - /** - * {@inheritDoc} - */ - public function getParticipants() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getParticipants', array()); - - return parent::getParticipants(); - } - - /** - * {@inheritDoc} - */ - public function isFinished() - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'isFinished', array()); - - return parent::isFinished(); - } - - /** - * {@inheritDoc} - */ - public function getValidationString(\Alchemy\Phrasea\Application $app, \Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getValidationString', array($app, $user)); - - return parent::getValidationString($app, $user); - } - - /** - * {@inheritDoc} - */ - public function getParticipant(\Alchemy\Phrasea\Model\Entities\User $user) - { - - $this->__initializer__ && $this->__initializer__->__invoke($this, 'getParticipant', array($user)); - - return parent::getParticipant($user); - } - -} diff --git a/tmp/doctrine/.gitignore b/tmp/doctrine/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/doctrine/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/download/.gitignore b/tmp/download/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/download/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/download/.gitkeep b/tmp/download/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tmp/lazaret/.gitignore b/tmp/lazaret/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/lazaret/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/lazaret/.gitkeep b/tmp/lazaret/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tmp/locks/.gitignore b/tmp/locks/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/locks/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/locks/.gitkeep b/tmp/locks/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tmp/serializer/.gitignore b/tmp/serializer/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/serializer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tmp/sessions/.gitkeep b/tmp/sessions/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tmp/translations/.gitignore b/tmp/translations/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tmp/translations/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml b/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml deleted file mode 100644 index 98358aa6ea..0000000000 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -:backends: yaml -:yaml: - :datadir: '/vagrant/vagrant/vms/phraseanet-php54-nginx/puphpet' -:hierarchy: - - config -:logger: console diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt b/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt deleted file mode 100644 index 0dc384f1e0..0000000000 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt +++ /dev/null @@ -1,57 +0,0 @@ - _ - / ) - .--.; | _...,-"""-, - .-""-.-""""-. / _`'-._.' /` \ - /' \ \| (/'-._/ ) ; - .-""""-; ( '--' /-' _ | - .' | ; e / a , ; - / \ | __.'`-.__, ; / - / `._ ; .-' `--.,__.\ /` - //| \ \,-' /\_.' - // | `;.___> /,-'. - /`| / |`\ _..---\ | \ - |/ / _,.-----\ | \ /`| | |\ \ - / .; | | | \ / | | | \ ) - | / | \ / |\..' \ \ | \ \..' - jgs \../ \.../ \.../ \.../---' \.../ - -Read me for some important information! - -If Puppet did not blow up (you do not see a sea of red above), then your VM -was generated successfully! - -* A unique private key was generated for you! It is located at - "puphpet/files/dot/ssh/id_rsa". If you are on Windows, a PuTTY-friendly key - was also generated at same location with a ".ppk" extension. -* If you want to use your own private key for future provisions, overwrite the - generated key above with your own. Make sure to follow the naming pattern, - and include a ".pub" public key. -* If you wish to add packages, modules, Apache/Nginx vhosts, or anything else, - open up "puphpet/config.yaml" and make changes within! Some things will - have random strings like "DIdXRs2OI2LJ" - you must create a random string - as well! To do so, please apply face to keyboard and roll. -* If you change "puphpet/config.yaml", simple run "$ vagrant provision" and - your VM will be updated with the changes you requested! - -Did something go wrong? Don't worry! I can (maybe) help! Please go to our -Github issues page at https://github.com/puphpet/puphpet/issues and search for -your problem. If you do not find your problem answered, open a new ticket! - ----------------------------------------------------------------------------- -PLEASE REMEMBER TO INCLUDE THE CONTENTS OF YOUR "puphpet/config.yaml" FILE. ----------------------------------------------------------------------------- - -Make sure to xxx out any potential API keys or passwords that you do not want -others to see! - -Happy programming! - - Juan Treminio - -┈╭━━━━━━━━━━━━┳━━╮┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈ - ┃ ╭╯ ┃ ▋┃╭━┓ ____ _ _ _ _ -╭┫ ┃ ┃ ┃┃╭┛ | _ \ ___ __ _ __| | / \ | |__ _____ _____| | -┃┃ ╰━━╯ ┃╰╯┃ | |_) / _ \/ _` |/ _` | / _ \ | '_ \ / _ \ \ / / _ \ | -╯┃ ╰┳━╯ | _ < __/ (_| | (_| | / ___ \| |_) | (_) \ V / __/_| - ┃ ┃ |_| \_\___|\__,_|\__,_| /_/ \_\_.__/ \___/ \_/ \___(_) - ┃ ┏━┳━━━━━━━┓ ┏ ┃ -▔┗━┻━┛▔▔▔▔▔▔▔┗━┻━┛▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔ diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt b/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt deleted file mode 100644 index 8cd11701e7..0000000000 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt +++ /dev/null @@ -1,6 +0,0 @@ - - ____ ____ _ _ ____ _ generated using - | _ \ _ _| _ \| | | | _ \ ___| |_ ___ ___ _ __ ___ - | |_) | | | | |_) | |_| | |_) / _ \ __| / __/ _ \| '_ ` _ \ - | __/| |_| | __/| _ | __/ __/ |_ | (_| (_) | | | | | | - |_| \__,_|_| |_| |_|_| \___|\__(_)___\___/|_| |_| |_| diff --git a/www/crossdomain.xml b/www/crossdomain.xml deleted file mode 100644 index 6d0caa5aed..0000000000 --- a/www/crossdomain.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/www/include/js/tests/jquery.Edit.js.html b/www/include/js/tests/jquery.Edit.js.html index 7ed089e551..cf44ea6336 100644 --- a/www/include/js/tests/jquery.Edit.js.html +++ b/www/include/js/tests/jquery.Edit.js.html @@ -4,9 +4,9 @@ - + - + - + - + - + - + - + + - + + - + + - + + - + +