From 59cd54b6d388660e80deacb276f1b3cc1cf323ab Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 11 May 2020 17:03:33 +0200 Subject: [PATCH] eolisation --- db/gen/schedule-create-0.sql | 5 ++ dicos/25_schedule.xml | 79 +++++++++++++++++++++++++ postservice/25-schedule | 2 + src/schedule-2.0/scripts/reconfigure.sh | 4 +- sso/filtres/schedule.ini | 14 +++++ sso/filtres/schedule_apps.ini | 6 ++ tmpl/schedule-apache.conf | 9 +++ tmpl/schedule-db.yml | 39 ++++++++++++ tmpl/schedule-env.local | 32 ++++++++++ tmpl/schedule-proxy.sh | 6 ++ 10 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 db/gen/schedule-create-0.sql create mode 100644 dicos/25_schedule.xml create mode 100755 postservice/25-schedule create mode 100644 sso/filtres/schedule.ini create mode 100644 sso/filtres/schedule_apps.ini create mode 100644 tmpl/schedule-apache.conf create mode 100644 tmpl/schedule-db.yml create mode 100644 tmpl/schedule-env.local create mode 100755 tmpl/schedule-proxy.sh diff --git a/db/gen/schedule-create-0.sql b/db/gen/schedule-create-0.sql new file mode 100644 index 0000000..0d4ccd7 --- /dev/null +++ b/db/gen/schedule-create-0.sql @@ -0,0 +1,5 @@ + + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +CREATE DATABASE schedule DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; + diff --git a/dicos/25_schedule.xml b/dicos/25_schedule.xml new file mode 100644 index 0000000..6231424 --- /dev/null +++ b/dicos/25_schedule.xml @@ -0,0 +1,79 @@ + + + + + + + + + schedule-apps + + schedule + + + + + + + + + + + + oui + + + ApiKeyschedule + + + + + + + + + + + + + + + + non + schedule + schedule + + + + non + schedule + schedule + schedule_api_key + + + + ['default', 'externe', 'local'] + + + local + schedule_dbserver + schedule_dbuser + schedule_dbport + schedule_dbpass + + + default + schedule_dbserver + schedule_dbuser + schedule_dbport + schedule_dbpass + schedule_allow_hosts + + + + + + + Outils de gestion de Planning + + diff --git a/postservice/25-schedule b/postservice/25-schedule new file mode 100755 index 0000000..0318e42 --- /dev/null +++ b/postservice/25-schedule @@ -0,0 +1,2 @@ +#!/bin/bash +CreoleRun "/var/www/html/ninegate/scripts/reconfigure.sh" web \ No newline at end of file diff --git a/src/schedule-2.0/scripts/reconfigure.sh b/src/schedule-2.0/scripts/reconfigure.sh index cd8501a..b6b4767 100755 --- a/src/schedule-2.0/scripts/reconfigure.sh +++ b/src/schedule-2.0/scripts/reconfigure.sh @@ -2,8 +2,8 @@ cd /var/www/html/schedule -#export HTTP_PROXY="192.168.57.160:8080" -#export HTTPS_PROXY="192.168.57.160:8080" +# Déclaration d'un proxy +. proxy.sh # Installation des dépendances composer composer install diff --git a/sso/filtres/schedule.ini b/sso/filtres/schedule.ini new file mode 100644 index 0000000..f61e4ce --- /dev/null +++ b/sso/filtres/schedule.ini @@ -0,0 +1,14 @@ +[user] +user=uid + +[username] +username=uid + +[firstname] +firstname=givenName + +[lastname] +lastname=sn + +[email] +email=mail \ No newline at end of file diff --git a/sso/filtres/schedule_apps.ini b/sso/filtres/schedule_apps.ini new file mode 100644 index 0000000..eeb6a81 --- /dev/null +++ b/sso/filtres/schedule_apps.ini @@ -0,0 +1,6 @@ +[schedule] +baseurl=/schedule/ +scheme=both +addr=0/0 +typeaddr=ip +filter=schedule diff --git a/tmpl/schedule-apache.conf b/tmpl/schedule-apache.conf new file mode 100644 index 0000000..28ae165 --- /dev/null +++ b/tmpl/schedule-apache.conf @@ -0,0 +1,9 @@ +Alias /schedule /var/www/html/schedule/public + + + AllowOverride All + Order Allow,Deny + Allow from All + Options Indexes FollowSymLinks MultiViews + php_admin_flag allow_url_fopen On + \ No newline at end of file diff --git a/tmpl/schedule-db.yml b/tmpl/schedule-db.yml new file mode 100644 index 0000000..dcb0883 --- /dev/null +++ b/tmpl/schedule-db.yml @@ -0,0 +1,39 @@ +--- +%set dmode = %%getVar('schedule_db_mode','non') +%if %%dmode == "externe" +dbhost: %%schedule_dbserver +dbport: %%schedule_dbport +dbroot: %%schedule_dbuser +dbrootpwd: %%schedule_dbpass +%else if %%dmode == "local" +dbhost: 127.0.0.1 +%end if +dbtype: mysql +dbname: schedule +dbuser: schedule +dbpass: "changeme" +%set allow_hosts = %%getVar('schedule_allow_hosts', '') +%if %%dmode == "local" +client_hosts: ["127.0.0.1", "localhost" %slurp +%else if %%dmode == "externe" +client_hosts: ["%%adresse_ip_eth0" %slurp +%end if +%if %%dmode != "default" + %if %%is_empty(%%allow_hosts) +] + %else + %for %%hst in %%allow_hosts +,"%%hst" %slurp + %end for +] + %end if +%end if + +createscript: "/usr/share/eole/db/schedule/gen/schedule-create-0.sql" + +%set cnt_prefix = %%getVar('container_path_reseau', '') +pwd_files: + - {file: '%%cnt_prefix/var/www/html/schedule/.env.local', + pattern: 'DATABASE_PASSWORD=', + owner: 'root:www-data', + mod: '660' } diff --git a/tmpl/schedule-env.local b/tmpl/schedule-env.local new file mode 100644 index 0000000..52044b3 --- /dev/null +++ b/tmpl/schedule-env.local @@ -0,0 +1,32 @@ +# Basic = Redefine local +APP_ENV=prod +APP_SECRET=%%schedule_api_key +APP_AUTH=CAS + + +# Bdd = Redefine local +DATABASE_NAME=schedule +DATABASE_USER=schedule +DATABASE_PASSWORD=tochange +%if %%getVar("ninegate_db_mode", 'non') == "externe" +DATABASE_HOST=%%ninegate_dbserver +%else if %%getVar("ninegate_db_mode", 'non') == "default" + %set dbhost = %%getVar('edb_host', 'non') + %if %%dbhost == 'non' and %%mode_conteneur_actif == 'oui': +DATABASE_HOST=%%adresse_ip_mysql + %else + %if %%dbhost == 'non' +DATABASE_HOST=localhost + %else +DATABASE_HOST=localhost + %end if + %end if +%else +DATABASE_HOST=%%adresse_ip_mysql +%end if + + +# CAS = Redefine local +CAS_HOST=%%eolesso_adresse +CAS_PORT=%%eolesso_port +CAS_PATH=%%eolesso_cas_folder \ No newline at end of file diff --git a/tmpl/schedule-proxy.sh b/tmpl/schedule-proxy.sh new file mode 100755 index 0000000..d35a3eb --- /dev/null +++ b/tmpl/schedule-proxy.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Si besoin export des valeurs de HTTP_PROXY et HTTPS_PROXY +%if %%activer_proxy_client == 'oui' +export HTTP_PROXY="%%proxy_client_adresse:%%proxy_client_port" +export HTTPS_PROXY="%%proxy_client_adresse:%%proxy_client_port" +%end if