From 45689e11bb6acb7afe43680a821652b7ac4f9169 Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Fri, 7 Jul 2017 17:47:55 +0200 Subject: [PATCH] fbb-ws & fbb-www - Folder with Puppet --- customer/fbb-ws/common.yaml | 46 +++++++++++++++++++++--------------- customer/fbb-www/common.yaml | 36 ++++++++++++++-------------- 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/customer/fbb-ws/common.yaml b/customer/fbb-ws/common.yaml index d0356686..89b08703 100644 --- a/customer/fbb-ws/common.yaml +++ b/customer/fbb-ws/common.yaml @@ -124,6 +124,11 @@ infra::additional_files: owner: apache group: root mode: '0755' + '/opt/app/web_alt': + ensure: 'directory' + owner: apache + group: root + mode: '0755' '/var/log/fbb_cdm_webservice': ensure: 'directory' owner: apache @@ -186,93 +191,96 @@ infra::additional_files: group: apache mode: '0644' # Create Fiona File Tree - '/www/data/fiona': + '/var/data/fiona': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/app': + '/var/data/fiona/app': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/app/0': + '/var/data/fiona/app/0': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/app/0/docs': + '/var/data/fiona/app/0/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/app/1': + '/var/data/fiona/app/1': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/app/1/docs': + '/var/data/fiona/app/1/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm_app': + '/var/data/fiona/cdm_app': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm_app/0': + '/var/data/fiona/cdm_app/0': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm_app/0/docs': + '/var/data/fiona/cdm_app/0/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm_app/1': + '/var/data/fiona/cdm_app/1': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm_app/1/docs': + '/var/data/fiona/cdm_app/1/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web': + '/var/data/fiona/web': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0': + '/var/data/fiona/web/0': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0/docs': + '/var/data/fiona/web/0/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0/docs/_airlines': + '/var/data/fiona/web/0/docs/_airlines': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1': + '/var/data/fiona/web/1': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1/docs': + '/var/data/fiona/web/1/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1/docs/_airlines': + '/var/data/fiona/web/1/docs/_airlines': ensure: 'directory' owner: web group: fbb - mode: '0775' \ No newline at end of file + mode: '0775' + '/www/data': + ensure: 'link' + target: '/var/data' \ No newline at end of file diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml index 9580552b..1ecb0477 100644 --- a/customer/fbb-www/common.yaml +++ b/customer/fbb-www/common.yaml @@ -213,92 +213,92 @@ infra::additional_files: owner: web group: fbb mode: '0775' - '/www/data/fiona/web': + '/var/data/fiona/web': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0': + '/var/data/fiona/web/0': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0/collections': + '/var/data/fiona/web/0/collections': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0/collections/live-docs': + '/var/data/fiona/web/0/collections/live-docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/0/docs': + '/var/data/fiona/web/0/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1': + '/var/data/fiona/web/1': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1/collections': + '/var/data/fiona/web/1/collections': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1/collections/live-docs': + '/var/data/fiona/web/1/collections/live-docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/web/1/docs': + '/var/data/fiona/web/1/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm': + '/var/data/fiona/cdm': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/0': + '/var/data/fiona/cdm/0': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/0/collections': + '/var/data/fiona/cdm/0/collections': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/0/collections/live-docs': + '/var/data/fiona/cdm/0/collections/live-docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/0/docs': + '/var/data/fiona/cdm/0/docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/1': + '/var/data/fiona/cdm/1': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/1/collections': + '/var/data/fiona/cdm/1/collections': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/1/collections/live-docs': + '/var/data/fiona/cdm/1/collections/live-docs': ensure: 'directory' owner: web group: fbb mode: '0775' - '/www/data/fiona/cdm/1/docs': + '/var/data/fiona/cdm/1/docs': ensure: 'directory' owner: web group: fbb -- 2.39.5