diff --git a/Makefile b/Makefile index 304c20cb237409d5dcb4dc5f3a55ae8accd60895..df848175e860f44d6bdf1c92f4c0d33fe66c56a5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ FVERSION=build/VERSION CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8" +IMAGENAME="fusioniam-rockylinux8" VVERSION=`cat $(FVERSION)` IDLDAP=`podman ps | grep 'fusioniam-directory-server' | sed -e 's/[ ].*//'` IDWPB=`podman ps | grep 'fusioniam-white-pages-php-fpm' | sed -e 's/[ ].*//'` @@ -32,7 +32,7 @@ runldap: --name=fusioniam-directory-server \ --detach=true \ --no-hosts \ - localhost/fusioniam-centos8-openldap-ltb:v0.1 + localhost/fusioniam-openldap-ltb:v0.1 runwp: mkdir -p run/volumes/wp-run @@ -45,7 +45,7 @@ runwp: --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - localhost/fusioniam-centos8-white-pages:v0.1 + localhost/fusioniam-white-pages:v0.1 $(CTN) run \ --env-file=./run/ENVVAR.example \ -v ./run/volumes/wp-run:/var/run/php-fpm/ \ @@ -55,7 +55,7 @@ runwp: --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - localhost/fusioniam-centos8-white-pages:v0.1 + localhost/fusioniam-white-pages:v0.1 runsd: mkdir -p run/volumes/sd-run @@ -68,7 +68,7 @@ runsd: --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - localhost/fusioniam-centos8-service-desk:v0.1 + localhost/fusioniam-service-desk:v0.1 $(CTN) run \ --env-file=./run/ENVVAR.example \ -v ./run/volumes/sd-run:/var/run/php-fpm/ \ @@ -78,7 +78,7 @@ runsd: --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - localhost/fusioniam-centos8-service-desk:v0.1 + localhost/fusioniam-service-desk:v0.1 runlemon: mkdir -p run/volumes/sso-data @@ -105,7 +105,7 @@ runlemon: --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","llng-fastcgi-server"]' \ - localhost/fusioniam-centos8-lemonldap-ng:v0.1 + localhost/fusioniam-lemonldap-ng:v0.1 $(CTN) run \ --env-file=./run/ENVVAR.example \ -v ./run/volumes/llng-run:/run/llng-fastcgi-server \ @@ -118,7 +118,7 @@ runlemon: --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - localhost/fusioniam-centos8-lemonldap-ng:v0.1 + localhost/fusioniam-lemonldap-ng:v0.1 $(CTN) run \ --env-file=./run/ENVVAR.example \ -v ./run/volumes/llng-run:/run/llng-fastcgi-server \ @@ -130,7 +130,7 @@ runlemon: --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","purge-sessions"]' \ - localhost/fusioniam-centos8-lemonldap-ng:v0.1 + localhost/fusioniam-lemonldap-ng:v0.1 runfd: mkdir -p run/volumes/fd-run @@ -143,7 +143,7 @@ runfd: --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - localhost/fusioniam-centos8-fusiondirectory:v0.1 + localhost/fusioniam-fusiondirectory:v0.1 $(CTN) run \ --env-file=./run/ENVVAR.example \ -v ./run/volumes/fd-run:/var/run/php-fpm/ \ @@ -153,7 +153,7 @@ runfd: --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - localhost/fusioniam-centos8-fusiondirectory:v0.1 + localhost/fusioniam-fusiondirectory:v0.1 runall: runldap runwp runsd runlemon runfd diff --git a/README.md b/README.md index baaad1c3d46a375f28c892365d6c6655e62b8cd7..81072df3834ad60c4242d7c906e9be690373dbc9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Go in `build/` and choose the subdirectory. For example: ``` -cd build/centos8 +cd build/rockylinux8 ``` Then build all images: @@ -42,8 +42,19 @@ podman images FusionIAM developers can upload images to OW2 repository: ``` -podman tag localhost/: gitlab.ow2.org:4567/fusioniam/fusioniam/: -podman push gitlab.ow2.org:4567/fusioniam/fusioniam/: +export FUSIONIAM_VERSION=v0.1 +podman tag localhost/fusioniam-rockylinux8:$FUSIONIAM_VERSION gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-rockylinux8:$FUSIONIAM_VERSION +podman tag localhost/fusioniam-openldap-ltb:$FUSIONIAM_VERSION gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-openldap-ltb:$FUSIONIAM_VERSION +podman tag localhost/fusioniam-lemonldap-ng:$FUSIONIAM_VERSION gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-lemonldap-ng:$FUSIONIAM_VERSION +podman tag localhost/fusioniam-fusiondirectory:$FUSIONIAM_VERSION gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-fusiondirectory:$FUSIONIAM_VERSION +podman tag localhost/fusioniam-service-desk:$FUSIONIAM_VERSION gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-service-desk:$FUSIONIAM_VERSION +podman tag localhost/fusioniam-white-pages:$FUSIONIAM_VERSION gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-white-pages:$FUSIONIAM_VERSION +podman push gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-rockylinux8:$FUSIONIAM_VERSION +podman push gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-openldap-ltb:$FUSIONIAM_VERSION +podman push gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-lemonldap-ng:$FUSIONIAM_VERSION +podman push gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-fusiondirectory:$FUSIONIAM_VERSION +podman push gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-service-desk:$FUSIONIAM_VERSION +podman push gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-white-pages:$FUSIONIAM_VERSION ``` ## Run @@ -132,7 +143,7 @@ podman run \ --name=fusioniam-directory-server \ --detach=true \ --no-hosts \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-openldap-ltb:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-openldap-ltb:v0.1 ``` Stop: @@ -158,7 +169,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-white-pages:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-white-pages:v0.1 ``` ``` @@ -171,7 +182,7 @@ podman run \ --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-white-pages:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-white-pages:v0.1 ``` Stop: @@ -197,7 +208,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-service-desk:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-service-desk:v0.1 ``` ``` @@ -210,7 +221,7 @@ podman run \ --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-service-desk:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-service-desk:v0.1 ``` Stop: @@ -266,7 +277,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","llng-fastcgi-server"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-lemonldap-ng:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-lemonldap-ng:v0.1 ``` ``` @@ -282,7 +293,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-lemonldap-ng:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-lemonldap-ng:v0.1 ``` ``` @@ -297,7 +308,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","purge-sessions"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-lemonldap-ng:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-lemonldap-ng:v0.1 ``` #### FIDM @@ -318,7 +329,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-fusiondirectory:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-fusiondirectory:v0.1 ``` ``` @@ -331,7 +342,7 @@ podman run \ --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-centos8-fusiondirectory:v0.1 + gitlab.ow2.org:4567/fusioniam/fusioniam/fusioniam-fusiondirectory:v0.1 ``` Stop: diff --git a/build/centos8/fusiondirectory/DEPENDENCY b/build/centos8/fusiondirectory/DEPENDENCY deleted file mode 100644 index 9f11f175e91ee2fa2702e56c3cdc46aac4971a2e..0000000000000000000000000000000000000000 --- a/build/centos8/fusiondirectory/DEPENDENCY +++ /dev/null @@ -1 +0,0 @@ -fusioniam-centos8 diff --git a/build/centos8/lemonldap-ng/DEPENDENCY b/build/centos8/lemonldap-ng/DEPENDENCY deleted file mode 100644 index 9f11f175e91ee2fa2702e56c3cdc46aac4971a2e..0000000000000000000000000000000000000000 --- a/build/centos8/lemonldap-ng/DEPENDENCY +++ /dev/null @@ -1 +0,0 @@ -fusioniam-centos8 diff --git a/build/centos8/openldap-ltb/DEPENDENCY b/build/centos8/openldap-ltb/DEPENDENCY deleted file mode 100644 index 9f11f175e91ee2fa2702e56c3cdc46aac4971a2e..0000000000000000000000000000000000000000 --- a/build/centos8/openldap-ltb/DEPENDENCY +++ /dev/null @@ -1 +0,0 @@ -fusioniam-centos8 diff --git a/build/centos8/service-desk/DEPENDENCY b/build/centos8/service-desk/DEPENDENCY deleted file mode 100644 index 9f11f175e91ee2fa2702e56c3cdc46aac4971a2e..0000000000000000000000000000000000000000 --- a/build/centos8/service-desk/DEPENDENCY +++ /dev/null @@ -1 +0,0 @@ -fusioniam-centos8 diff --git a/build/centos8/white-pages/DEPENDENCY b/build/centos8/white-pages/DEPENDENCY deleted file mode 100644 index 9f11f175e91ee2fa2702e56c3cdc46aac4971a2e..0000000000000000000000000000000000000000 --- a/build/centos8/white-pages/DEPENDENCY +++ /dev/null @@ -1 +0,0 @@ -fusioniam-centos8 diff --git a/build/centos8/Dockerfile b/build/rockylinux8/Dockerfile similarity index 86% rename from build/centos8/Dockerfile rename to build/rockylinux8/Dockerfile index 94ea1002ac0360a39102386536dd1268441cc0ee..260dfc72a3cffd7f3ec4f4bd712e1605187cf694 100644 --- a/build/centos8/Dockerfile +++ b/build/rockylinux8/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/centos:8 +FROM docker.io/library/rockylinux:8 LABEL app=fusioniam diff --git a/build/centos8/Makefile b/build/rockylinux8/Makefile similarity index 94% rename from build/centos8/Makefile rename to build/rockylinux8/Makefile index e8f936a79fcfa658a0c0ec056bc9f2e652422ac9..516495af348909087a28e3c06e89b036424aea1c 100644 --- a/build/centos8/Makefile +++ b/build/rockylinux8/Makefile @@ -1,7 +1,7 @@ FVERSION=../VERSION CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8" +IMAGENAME="fusioniam-rockylinux8" VVERSION=`cat $(FVERSION)` all: diff --git a/build/centos8/ansible/install.yaml b/build/rockylinux8/ansible/install.yaml similarity index 100% rename from build/centos8/ansible/install.yaml rename to build/rockylinux8/ansible/install.yaml diff --git a/build/rockylinux8/fusiondirectory/DEPENDENCY b/build/rockylinux8/fusiondirectory/DEPENDENCY new file mode 100644 index 0000000000000000000000000000000000000000..e61628fa085799a2d625fe7cf1c1884bef9a12a3 --- /dev/null +++ b/build/rockylinux8/fusiondirectory/DEPENDENCY @@ -0,0 +1 @@ +fusioniam-rockylinux8 diff --git a/build/centos8/fusiondirectory/Dockerfile b/build/rockylinux8/fusiondirectory/Dockerfile similarity index 100% rename from build/centos8/fusiondirectory/Dockerfile rename to build/rockylinux8/fusiondirectory/Dockerfile diff --git a/build/centos8/fusiondirectory/Makefile b/build/rockylinux8/fusiondirectory/Makefile similarity index 88% rename from build/centos8/fusiondirectory/Makefile rename to build/rockylinux8/fusiondirectory/Makefile index bb74b9f86a1573be31455ace2a6f5dd88a270593..e302b9adf980e1d5ec4940906c8b39669f712221 100644 --- a/build/centos8/fusiondirectory/Makefile +++ b/build/rockylinux8/fusiondirectory/Makefile @@ -2,7 +2,7 @@ FVERSION=../../VERSION FDEPEND=DEPENDENCY CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8-fusiondirectory" +IMAGENAME="fusioniam-fusiondirectory" VDEPEND=`cat $(FDEPEND)` VVERSION=`cat $(FVERSION)` diff --git a/build/centos8/fusiondirectory/ansible/deploy.yaml b/build/rockylinux8/fusiondirectory/ansible/deploy.yaml similarity index 100% rename from build/centos8/fusiondirectory/ansible/deploy.yaml rename to build/rockylinux8/fusiondirectory/ansible/deploy.yaml diff --git a/build/centos8/fusiondirectory/ansible/files/RPM-GPG-KEY-LTB-project b/build/rockylinux8/fusiondirectory/ansible/files/RPM-GPG-KEY-LTB-project similarity index 100% rename from build/centos8/fusiondirectory/ansible/files/RPM-GPG-KEY-LTB-project rename to build/rockylinux8/fusiondirectory/ansible/files/RPM-GPG-KEY-LTB-project diff --git a/build/centos8/fusiondirectory/ansible/files/RPM-GPG-KEY-remi2018 b/build/rockylinux8/fusiondirectory/ansible/files/RPM-GPG-KEY-remi2018 similarity index 100% rename from build/centos8/fusiondirectory/ansible/files/RPM-GPG-KEY-remi2018 rename to build/rockylinux8/fusiondirectory/ansible/files/RPM-GPG-KEY-remi2018 diff --git a/build/centos8/fusiondirectory/ansible/files/php-fpm.www.conf b/build/rockylinux8/fusiondirectory/ansible/files/php-fpm.www.conf similarity index 100% rename from build/centos8/fusiondirectory/ansible/files/php-fpm.www.conf rename to build/rockylinux8/fusiondirectory/ansible/files/php-fpm.www.conf diff --git a/build/centos8/fusiondirectory/ansible/files/vendor/prototype/prototype.js b/build/rockylinux8/fusiondirectory/ansible/files/vendor/prototype/prototype.js similarity index 100% rename from build/centos8/fusiondirectory/ansible/files/vendor/prototype/prototype.js rename to build/rockylinux8/fusiondirectory/ansible/files/vendor/prototype/prototype.js diff --git a/build/centos8/fusiondirectory/ansible/files/vendor/smarty-gettext/block.t.php b/build/rockylinux8/fusiondirectory/ansible/files/vendor/smarty-gettext/block.t.php similarity index 100% rename from build/centos8/fusiondirectory/ansible/files/vendor/smarty-gettext/block.t.php rename to build/rockylinux8/fusiondirectory/ansible/files/vendor/smarty-gettext/block.t.php diff --git a/build/centos8/fusiondirectory/ansible/files/vendor/smarty-gettext/function.locale.php b/build/rockylinux8/fusiondirectory/ansible/files/vendor/smarty-gettext/function.locale.php similarity index 100% rename from build/centos8/fusiondirectory/ansible/files/vendor/smarty-gettext/function.locale.php rename to build/rockylinux8/fusiondirectory/ansible/files/vendor/smarty-gettext/function.locale.php diff --git a/build/centos8/fusiondirectory/ansible/install-plugin.sh b/build/rockylinux8/fusiondirectory/ansible/install-plugin.sh similarity index 100% rename from build/centos8/fusiondirectory/ansible/install-plugin.sh rename to build/rockylinux8/fusiondirectory/ansible/install-plugin.sh diff --git a/build/centos8/fusiondirectory/ansible/install.yaml b/build/rockylinux8/fusiondirectory/ansible/install.yaml similarity index 100% rename from build/centos8/fusiondirectory/ansible/install.yaml rename to build/rockylinux8/fusiondirectory/ansible/install.yaml diff --git a/build/centos8/fusiondirectory/ansible/plugins.yaml b/build/rockylinux8/fusiondirectory/ansible/plugins.yaml similarity index 100% rename from build/centos8/fusiondirectory/ansible/plugins.yaml rename to build/rockylinux8/fusiondirectory/ansible/plugins.yaml diff --git a/build/centos8/fusiondirectory/ansible/run-ct.sh b/build/rockylinux8/fusiondirectory/ansible/run-ct.sh similarity index 100% rename from build/centos8/fusiondirectory/ansible/run-ct.sh rename to build/rockylinux8/fusiondirectory/ansible/run-ct.sh diff --git a/build/centos8/fusiondirectory/ansible/templates/fusiondirectory-nginx.conf.j2 b/build/rockylinux8/fusiondirectory/ansible/templates/fusiondirectory-nginx.conf.j2 similarity index 100% rename from build/centos8/fusiondirectory/ansible/templates/fusiondirectory-nginx.conf.j2 rename to build/rockylinux8/fusiondirectory/ansible/templates/fusiondirectory-nginx.conf.j2 diff --git a/build/centos8/fusiondirectory/ansible/templates/fusiondirectory.conf.j2 b/build/rockylinux8/fusiondirectory/ansible/templates/fusiondirectory.conf.j2 similarity index 100% rename from build/centos8/fusiondirectory/ansible/templates/fusiondirectory.conf.j2 rename to build/rockylinux8/fusiondirectory/ansible/templates/fusiondirectory.conf.j2 diff --git a/build/rockylinux8/lemonldap-ng/DEPENDENCY b/build/rockylinux8/lemonldap-ng/DEPENDENCY new file mode 100644 index 0000000000000000000000000000000000000000..e61628fa085799a2d625fe7cf1c1884bef9a12a3 --- /dev/null +++ b/build/rockylinux8/lemonldap-ng/DEPENDENCY @@ -0,0 +1 @@ +fusioniam-rockylinux8 diff --git a/build/centos8/lemonldap-ng/Dockerfile b/build/rockylinux8/lemonldap-ng/Dockerfile similarity index 100% rename from build/centos8/lemonldap-ng/Dockerfile rename to build/rockylinux8/lemonldap-ng/Dockerfile diff --git a/build/centos8/lemonldap-ng/Makefile b/build/rockylinux8/lemonldap-ng/Makefile similarity index 89% rename from build/centos8/lemonldap-ng/Makefile rename to build/rockylinux8/lemonldap-ng/Makefile index 30673fcb876b138f04cfa71599103503761af175..81c8ad602dcbd1309bc745fc30179752af1df9b4 100644 --- a/build/centos8/lemonldap-ng/Makefile +++ b/build/rockylinux8/lemonldap-ng/Makefile @@ -2,7 +2,7 @@ FVERSION=../../VERSION FDEPEND=DEPENDENCY CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8-lemonldap-ng" +IMAGENAME="fusioniam-lemonldap-ng" VDEPEND=`cat $(FDEPEND)` VVERSION=`cat $(FVERSION)` diff --git a/build/centos8/lemonldap-ng/ansible/deploy.yaml b/build/rockylinux8/lemonldap-ng/ansible/deploy.yaml similarity index 99% rename from build/centos8/lemonldap-ng/ansible/deploy.yaml rename to build/rockylinux8/lemonldap-ng/ansible/deploy.yaml index 312cb3208437ef46f02d1dac4618911e126555a9..704d1addc55d127cb5f36a0a116486fe68ec905e 100644 --- a/build/centos8/lemonldap-ng/ansible/deploy.yaml +++ b/build/rockylinux8/lemonldap-ng/ansible/deploy.yaml @@ -2,6 +2,7 @@ - hosts: localhost vars: + ansible_python_interpreter: "/usr/bin/python3.6" lemonldap2_pghost: "{{ lookup('env', 'POSTGRES_HOST') }}" lemonldap2_pgport: "{{ lookup('env', 'POSTGRES_PORT') }}" lemonldap2_pguser: "{{ lookup('env', 'POSTGRES_USER') }}" diff --git a/build/centos8/lemonldap-ng/ansible/files/customfooter.tpl b/build/rockylinux8/lemonldap-ng/ansible/files/customfooter.tpl similarity index 100% rename from build/centos8/lemonldap-ng/ansible/files/customfooter.tpl rename to build/rockylinux8/lemonldap-ng/ansible/files/customfooter.tpl diff --git a/build/centos8/lemonldap-ng/ansible/files/fusioniam-background.jpg b/build/rockylinux8/lemonldap-ng/ansible/files/fusioniam-background.jpg similarity index 100% rename from build/centos8/lemonldap-ng/ansible/files/fusioniam-background.jpg rename to build/rockylinux8/lemonldap-ng/ansible/files/fusioniam-background.jpg diff --git a/build/centos8/lemonldap-ng/ansible/files/fusioniam-logo.png b/build/rockylinux8/lemonldap-ng/ansible/files/fusioniam-logo.png similarity index 100% rename from build/centos8/lemonldap-ng/ansible/files/fusioniam-logo.png rename to build/rockylinux8/lemonldap-ng/ansible/files/fusioniam-logo.png diff --git a/build/centos8/lemonldap-ng/ansible/files/fusioniam.css b/build/rockylinux8/lemonldap-ng/ansible/files/fusioniam.css similarity index 100% rename from build/centos8/lemonldap-ng/ansible/files/fusioniam.css rename to build/rockylinux8/lemonldap-ng/ansible/files/fusioniam.css diff --git a/build/centos8/lemonldap-ng/ansible/files/log4perl.conf b/build/rockylinux8/lemonldap-ng/ansible/files/log4perl.conf similarity index 100% rename from build/centos8/lemonldap-ng/ansible/files/log4perl.conf rename to build/rockylinux8/lemonldap-ng/ansible/files/log4perl.conf diff --git a/build/centos8/lemonldap-ng/ansible/files/proxy_params b/build/rockylinux8/lemonldap-ng/ansible/files/proxy_params similarity index 100% rename from build/centos8/lemonldap-ng/ansible/files/proxy_params rename to build/rockylinux8/lemonldap-ng/ansible/files/proxy_params diff --git a/build/centos8/lemonldap-ng/ansible/install.yaml b/build/rockylinux8/lemonldap-ng/ansible/install.yaml similarity index 99% rename from build/centos8/lemonldap-ng/ansible/install.yaml rename to build/rockylinux8/lemonldap-ng/ansible/install.yaml index a9a07363b9b9db5ddb49f709a9f360d1d6232a8e..3132d3941bacfc8af2f12bda95520d7f734f6aa6 100644 --- a/build/centos8/lemonldap-ng/ansible/install.yaml +++ b/build/rockylinux8/lemonldap-ng/ansible/install.yaml @@ -46,6 +46,7 @@ - "lemonldap-ng-{{ lemonldap2_version }}" - "lemonldap-ng-fastcgi-server-{{ lemonldap2_version }}" - "lemonldap-ng-nginx-{{ lemonldap2_version }}" + - python36 - python3-ldap - python3-psycopg2 - perl-DBD-Pg diff --git a/build/centos8/lemonldap-ng/ansible/library/lemonldap_config.py b/build/rockylinux8/lemonldap-ng/ansible/library/lemonldap_config.py similarity index 100% rename from build/centos8/lemonldap-ng/ansible/library/lemonldap_config.py rename to build/rockylinux8/lemonldap-ng/ansible/library/lemonldap_config.py diff --git a/build/centos8/lemonldap-ng/ansible/llng_config_auth.yml b/build/rockylinux8/lemonldap-ng/ansible/llng_config_auth.yml similarity index 95% rename from build/centos8/lemonldap-ng/ansible/llng_config_auth.yml rename to build/rockylinux8/lemonldap-ng/ansible/llng_config_auth.yml index a57b4a606af4cac95f3614c5505d62397832a3e3..232e5168082b3c4812dd995ab7cfe456f035bdba 100644 --- a/build/centos8/lemonldap-ng/ansible/llng_config_auth.yml +++ b/build/rockylinux8/lemonldap-ng/ansible/llng_config_auth.yml @@ -12,13 +12,13 @@ userPassword: "{{ lemonldap2_ldappassword }}" - name: Add tech account to write-all ACL - ldap_attr: + ldap_attrs: server_uri: "ldap://{{ lemonldap2_ldaphost }}:{{ lemonldap2_ldapport }}/" bind_dn: "{{ lemonldap2_ldapadmindn }}" bind_pw: "{{ lemonldap2_ldapadminpassword }}" dn: cn=acl-write-all,ou=groups,o=admin,dc=fusioniam,dc=org - name: member - values: "cn={{ lemonldap2_ldapusername }},ou=dsa,o=admin,dc=fusioniam,dc=org" + attributes: + member: cn={{ lemonldap2_ldapusername }},ou=dsa,o=admin,dc=fusioniam,dc=org state: present - name: Set Auth config diff --git a/build/centos8/lemonldap-ng/ansible/llng_config_base.yml b/build/rockylinux8/lemonldap-ng/ansible/llng_config_base.yml similarity index 100% rename from build/centos8/lemonldap-ng/ansible/llng_config_base.yml rename to build/rockylinux8/lemonldap-ng/ansible/llng_config_base.yml diff --git a/build/centos8/lemonldap-ng/ansible/llng_config_db.yml b/build/rockylinux8/lemonldap-ng/ansible/llng_config_db.yml similarity index 100% rename from build/centos8/lemonldap-ng/ansible/llng_config_db.yml rename to build/rockylinux8/lemonldap-ng/ansible/llng_config_db.yml diff --git a/build/centos8/lemonldap-ng/ansible/llng_config_issuers.yml b/build/rockylinux8/lemonldap-ng/ansible/llng_config_issuers.yml similarity index 100% rename from build/centos8/lemonldap-ng/ansible/llng_config_issuers.yml rename to build/rockylinux8/lemonldap-ng/ansible/llng_config_issuers.yml diff --git a/build/centos8/lemonldap-ng/ansible/llng_config_sessions.yml b/build/rockylinux8/lemonldap-ng/ansible/llng_config_sessions.yml similarity index 100% rename from build/centos8/lemonldap-ng/ansible/llng_config_sessions.yml rename to build/rockylinux8/lemonldap-ng/ansible/llng_config_sessions.yml diff --git a/build/centos8/lemonldap-ng/ansible/run-ct.sh b/build/rockylinux8/lemonldap-ng/ansible/run-ct.sh similarity index 100% rename from build/centos8/lemonldap-ng/ansible/run-ct.sh rename to build/rockylinux8/lemonldap-ng/ansible/run-ct.sh diff --git a/build/centos8/lemonldap-ng/ansible/templates/api-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/api-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/api-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/api-nginx.conf.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/fd-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/fd-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/fd-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/fd-nginx.conf.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/handler-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/handler-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/handler-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/handler-nginx.conf.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/lemonldap-ng.ini.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/lemonldap-ng.ini.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/lemonldap-ng.ini.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/lemonldap-ng.ini.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/llng-fastcgi-server.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/llng-fastcgi-server.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/llng-fastcgi-server.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/llng-fastcgi-server.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/manager-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/manager-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/manager-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/manager-nginx.conf.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/nginx-lmlog.conf b/build/rockylinux8/lemonldap-ng/ansible/templates/nginx-lmlog.conf similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/nginx-lmlog.conf rename to build/rockylinux8/lemonldap-ng/ansible/templates/nginx-lmlog.conf diff --git a/build/centos8/lemonldap-ng/ansible/templates/portal-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/portal-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/portal-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/portal-nginx.conf.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/sd-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/sd-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/sd-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/sd-nginx.conf.j2 diff --git a/build/centos8/lemonldap-ng/ansible/templates/wp-nginx.conf.j2 b/build/rockylinux8/lemonldap-ng/ansible/templates/wp-nginx.conf.j2 similarity index 100% rename from build/centos8/lemonldap-ng/ansible/templates/wp-nginx.conf.j2 rename to build/rockylinux8/lemonldap-ng/ansible/templates/wp-nginx.conf.j2 diff --git a/build/rockylinux8/openldap-ltb/DEPENDENCY b/build/rockylinux8/openldap-ltb/DEPENDENCY new file mode 100644 index 0000000000000000000000000000000000000000..e61628fa085799a2d625fe7cf1c1884bef9a12a3 --- /dev/null +++ b/build/rockylinux8/openldap-ltb/DEPENDENCY @@ -0,0 +1 @@ +fusioniam-rockylinux8 diff --git a/build/centos8/openldap-ltb/Dockerfile b/build/rockylinux8/openldap-ltb/Dockerfile similarity index 100% rename from build/centos8/openldap-ltb/Dockerfile rename to build/rockylinux8/openldap-ltb/Dockerfile diff --git a/build/centos8/openldap-ltb/Makefile b/build/rockylinux8/openldap-ltb/Makefile similarity index 89% rename from build/centos8/openldap-ltb/Makefile rename to build/rockylinux8/openldap-ltb/Makefile index db35b026d8d6c2136d005f058d76606432c391ec..3abad93d4a5ed7ecdd175196f9ac6362a6f4ea99 100644 --- a/build/centos8/openldap-ltb/Makefile +++ b/build/rockylinux8/openldap-ltb/Makefile @@ -2,7 +2,7 @@ FVERSION=../../VERSION FDEPEND=DEPENDENCY CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8-openldap-ltb" +IMAGENAME="fusioniam-openldap-ltb" VDEPEND=`cat $(FDEPEND)` VVERSION=`cat $(FVERSION)` diff --git a/build/centos8/openldap-ltb/ansible/deploy.yaml b/build/rockylinux8/openldap-ltb/ansible/deploy.yaml similarity index 100% rename from build/centos8/openldap-ltb/ansible/deploy.yaml rename to build/rockylinux8/openldap-ltb/ansible/deploy.yaml diff --git a/build/centos8/openldap-ltb/ansible/files/RPM-GPG-KEY-LTB-project b/build/rockylinux8/openldap-ltb/ansible/files/RPM-GPG-KEY-LTB-project similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/RPM-GPG-KEY-LTB-project rename to build/rockylinux8/openldap-ltb/ansible/files/RPM-GPG-KEY-LTB-project diff --git a/build/centos8/openldap-ltb/ansible/files/audit-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/audit-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/audit-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/audit-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/audit-fd.ldif b/build/rockylinux8/openldap-ltb/ansible/files/audit-fd.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/audit-fd.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/audit-fd.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/core-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/core-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/core-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/core-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/core-fd.ldif b/build/rockylinux8/openldap-ltb/ansible/files/core-fd.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/core-fd.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/core-fd.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/dsa-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/dsa-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/dsa-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/dsa-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/ldapns.ldif b/build/rockylinux8/openldap-ltb/ansible/files/ldapns.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/ldapns.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/ldapns.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/mail-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/mail-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/mail-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/mail-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/mail-fd.ldif b/build/rockylinux8/openldap-ltb/ansible/files/mail-fd.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/mail-fd.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/mail-fd.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/openssh-lpk.ldif b/build/rockylinux8/openldap-ltb/ansible/files/openssh-lpk.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/openssh-lpk.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/openssh-lpk.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/personal-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/personal-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/personal-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/personal-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/personal-fd.ldif b/build/rockylinux8/openldap-ltb/ansible/files/personal-fd.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/personal-fd.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/personal-fd.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/ppolicy-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/ppolicy-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/ppolicy-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/ppolicy-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/public-forms-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/public-forms-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/public-forms-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/public-forms-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/public-forms-fd.ldif b/build/rockylinux8/openldap-ltb/ansible/files/public-forms-fd.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/public-forms-fd.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/public-forms-fd.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/template-fd.ldif b/build/rockylinux8/openldap-ltb/ansible/files/template-fd.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/template-fd.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/template-fd.ldif diff --git a/build/centos8/openldap-ltb/ansible/files/webservice-fd-conf.ldif b/build/rockylinux8/openldap-ltb/ansible/files/webservice-fd-conf.ldif similarity index 100% rename from build/centos8/openldap-ltb/ansible/files/webservice-fd-conf.ldif rename to build/rockylinux8/openldap-ltb/ansible/files/webservice-fd-conf.ldif diff --git a/build/centos8/openldap-ltb/ansible/install.yaml b/build/rockylinux8/openldap-ltb/ansible/install.yaml similarity index 100% rename from build/centos8/openldap-ltb/ansible/install.yaml rename to build/rockylinux8/openldap-ltb/ansible/install.yaml diff --git a/build/centos8/openldap-ltb/ansible/run-ct.sh b/build/rockylinux8/openldap-ltb/ansible/run-ct.sh similarity index 100% rename from build/centos8/openldap-ltb/ansible/run-ct.sh rename to build/rockylinux8/openldap-ltb/ansible/run-ct.sh diff --git a/build/centos8/openldap-ltb/ansible/templates/config.ldif.j2 b/build/rockylinux8/openldap-ltb/ansible/templates/config.ldif.j2 similarity index 100% rename from build/centos8/openldap-ltb/ansible/templates/config.ldif.j2 rename to build/rockylinux8/openldap-ltb/ansible/templates/config.ldif.j2 diff --git a/build/centos8/openldap-ltb/ansible/templates/data.ldif.j2 b/build/rockylinux8/openldap-ltb/ansible/templates/data.ldif.j2 similarity index 100% rename from build/centos8/openldap-ltb/ansible/templates/data.ldif.j2 rename to build/rockylinux8/openldap-ltb/ansible/templates/data.ldif.j2 diff --git a/build/centos8/run-ct.sh b/build/rockylinux8/run-ct.sh similarity index 100% rename from build/centos8/run-ct.sh rename to build/rockylinux8/run-ct.sh diff --git a/build/centos8/run-playbook.sh b/build/rockylinux8/run-playbook.sh similarity index 100% rename from build/centos8/run-playbook.sh rename to build/rockylinux8/run-playbook.sh diff --git a/build/centos8/run.sh b/build/rockylinux8/run.sh similarity index 100% rename from build/centos8/run.sh rename to build/rockylinux8/run.sh diff --git a/build/rockylinux8/service-desk/DEPENDENCY b/build/rockylinux8/service-desk/DEPENDENCY new file mode 100644 index 0000000000000000000000000000000000000000..e61628fa085799a2d625fe7cf1c1884bef9a12a3 --- /dev/null +++ b/build/rockylinux8/service-desk/DEPENDENCY @@ -0,0 +1 @@ +fusioniam-rockylinux8 diff --git a/build/centos8/service-desk/Dockerfile b/build/rockylinux8/service-desk/Dockerfile similarity index 100% rename from build/centos8/service-desk/Dockerfile rename to build/rockylinux8/service-desk/Dockerfile diff --git a/build/centos8/service-desk/Makefile b/build/rockylinux8/service-desk/Makefile similarity index 89% rename from build/centos8/service-desk/Makefile rename to build/rockylinux8/service-desk/Makefile index 302449ebb271f03d9efeaf0416919d68d96641aa..c44f1ed401327354990e03ddee44dfa316d6cb74 100644 --- a/build/centos8/service-desk/Makefile +++ b/build/rockylinux8/service-desk/Makefile @@ -2,7 +2,7 @@ FVERSION=../../VERSION FDEPEND=DEPENDENCY CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8-service-desk" +IMAGENAME="fusioniam-service-desk" VDEPEND=`cat $(FDEPEND)` VVERSION=`cat $(FVERSION)` diff --git a/build/centos8/service-desk/ansible/deploy.yaml b/build/rockylinux8/service-desk/ansible/deploy.yaml similarity index 100% rename from build/centos8/service-desk/ansible/deploy.yaml rename to build/rockylinux8/service-desk/ansible/deploy.yaml diff --git a/build/centos8/service-desk/ansible/files/RPM-GPG-KEY-LTB-project b/build/rockylinux8/service-desk/ansible/files/RPM-GPG-KEY-LTB-project similarity index 100% rename from build/centos8/service-desk/ansible/files/RPM-GPG-KEY-LTB-project rename to build/rockylinux8/service-desk/ansible/files/RPM-GPG-KEY-LTB-project diff --git a/build/centos8/service-desk/ansible/files/php-fpm.www.conf b/build/rockylinux8/service-desk/ansible/files/php-fpm.www.conf similarity index 100% rename from build/centos8/service-desk/ansible/files/php-fpm.www.conf rename to build/rockylinux8/service-desk/ansible/files/php-fpm.www.conf diff --git a/build/centos8/service-desk/ansible/install.yaml b/build/rockylinux8/service-desk/ansible/install.yaml similarity index 100% rename from build/centos8/service-desk/ansible/install.yaml rename to build/rockylinux8/service-desk/ansible/install.yaml diff --git a/build/centos8/service-desk/ansible/run-ct.sh b/build/rockylinux8/service-desk/ansible/run-ct.sh similarity index 100% rename from build/centos8/service-desk/ansible/run-ct.sh rename to build/rockylinux8/service-desk/ansible/run-ct.sh diff --git a/build/centos8/service-desk/ansible/templates/config.inc.local.php.j2 b/build/rockylinux8/service-desk/ansible/templates/config.inc.local.php.j2 similarity index 100% rename from build/centos8/service-desk/ansible/templates/config.inc.local.php.j2 rename to build/rockylinux8/service-desk/ansible/templates/config.inc.local.php.j2 diff --git a/build/centos8/service-desk/ansible/templates/service-desk.conf.j2 b/build/rockylinux8/service-desk/ansible/templates/service-desk.conf.j2 similarity index 100% rename from build/centos8/service-desk/ansible/templates/service-desk.conf.j2 rename to build/rockylinux8/service-desk/ansible/templates/service-desk.conf.j2 diff --git a/build/rockylinux8/white-pages/DEPENDENCY b/build/rockylinux8/white-pages/DEPENDENCY new file mode 100644 index 0000000000000000000000000000000000000000..e61628fa085799a2d625fe7cf1c1884bef9a12a3 --- /dev/null +++ b/build/rockylinux8/white-pages/DEPENDENCY @@ -0,0 +1 @@ +fusioniam-rockylinux8 diff --git a/build/centos8/white-pages/Dockerfile b/build/rockylinux8/white-pages/Dockerfile similarity index 100% rename from build/centos8/white-pages/Dockerfile rename to build/rockylinux8/white-pages/Dockerfile diff --git a/build/centos8/white-pages/Makefile b/build/rockylinux8/white-pages/Makefile similarity index 89% rename from build/centos8/white-pages/Makefile rename to build/rockylinux8/white-pages/Makefile index 7fcfd9b566e03c2b4f437f26852137e6451f8036..e7740f0fa5194ac017a523a49bbca12ffdb2c09a 100644 --- a/build/centos8/white-pages/Makefile +++ b/build/rockylinux8/white-pages/Makefile @@ -2,7 +2,7 @@ FVERSION=../../VERSION FDEPEND=DEPENDENCY CTN=`which podman >/dev/null 2>&1 && echo podman || echo docker` -IMAGENAME="fusioniam-centos8-white-pages" +IMAGENAME="fusioniam-white-pages" VDEPEND=`cat $(FDEPEND)` VVERSION=`cat $(FVERSION)` diff --git a/build/centos8/white-pages/ansible/deploy.yaml b/build/rockylinux8/white-pages/ansible/deploy.yaml similarity index 100% rename from build/centos8/white-pages/ansible/deploy.yaml rename to build/rockylinux8/white-pages/ansible/deploy.yaml diff --git a/build/centos8/white-pages/ansible/files/RPM-GPG-KEY-LTB-project b/build/rockylinux8/white-pages/ansible/files/RPM-GPG-KEY-LTB-project similarity index 100% rename from build/centos8/white-pages/ansible/files/RPM-GPG-KEY-LTB-project rename to build/rockylinux8/white-pages/ansible/files/RPM-GPG-KEY-LTB-project diff --git a/build/centos8/white-pages/ansible/files/php-fpm.www.conf b/build/rockylinux8/white-pages/ansible/files/php-fpm.www.conf similarity index 100% rename from build/centos8/white-pages/ansible/files/php-fpm.www.conf rename to build/rockylinux8/white-pages/ansible/files/php-fpm.www.conf diff --git a/build/centos8/white-pages/ansible/install.yaml b/build/rockylinux8/white-pages/ansible/install.yaml similarity index 100% rename from build/centos8/white-pages/ansible/install.yaml rename to build/rockylinux8/white-pages/ansible/install.yaml diff --git a/build/centos8/white-pages/ansible/run-ct.sh b/build/rockylinux8/white-pages/ansible/run-ct.sh similarity index 100% rename from build/centos8/white-pages/ansible/run-ct.sh rename to build/rockylinux8/white-pages/ansible/run-ct.sh diff --git a/build/centos8/white-pages/ansible/templates/config.inc.local.php.j2 b/build/rockylinux8/white-pages/ansible/templates/config.inc.local.php.j2 similarity index 100% rename from build/centos8/white-pages/ansible/templates/config.inc.local.php.j2 rename to build/rockylinux8/white-pages/ansible/templates/config.inc.local.php.j2 diff --git a/build/centos8/white-pages/ansible/templates/white-pages.conf.j2 b/build/rockylinux8/white-pages/ansible/templates/white-pages.conf.j2 similarity index 100% rename from build/centos8/white-pages/ansible/templates/white-pages.conf.j2 rename to build/rockylinux8/white-pages/ansible/templates/white-pages.conf.j2 diff --git a/run/start-all.sh b/run/start-all.sh index 54a3a0b535d526ea6aa640d4be48de4ba6e7b424..b8148af187c2486921f5b7efe6ca71e287d0f684 100755 --- a/run/start-all.sh +++ b/run/start-all.sh @@ -20,7 +20,7 @@ podman run \ --name=fusioniam-directory-server \ --detach=true \ --no-hosts \ - $repository/fusioniam-centos8-openldap-ltb:$version + $repository/fusioniam-openldap-ltb:$version # FIAM @@ -51,7 +51,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","llng-fastcgi-server"]' \ - $repository/fusioniam-centos8-lemonldap-ng:$version + $repository/fusioniam-lemonldap-ng:$version podman run \ --env-file=$script_path/ENVVAR.example \ @@ -65,7 +65,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - $repository/fusioniam-centos8-lemonldap-ng:$version + $repository/fusioniam-lemonldap-ng:$version podman run \ --env-file=$script_path/ENVVAR.example \ @@ -78,7 +78,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","purge-sessions"]' \ - $repository/fusioniam-centos8-lemonldap-ng:$version + $repository/fusioniam-lemonldap-ng:$version # FIWP @@ -93,7 +93,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - $repository/fusioniam-centos8-white-pages:$version + $repository/fusioniam-white-pages:$version podman run \ --env-file=$script_path/ENVVAR.example \ @@ -104,7 +104,7 @@ podman run \ --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - $repository/fusioniam-centos8-white-pages:$version + $repository/fusioniam-white-pages:$version # FISD @@ -119,7 +119,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - $repository/fusioniam-centos8-service-desk:$version + $repository/fusioniam-service-desk:$version podman run \ --env-file=$script_path/ENVVAR.example \ @@ -130,7 +130,7 @@ podman run \ --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - $repository/fusioniam-centos8-service-desk:$version + $repository/fusioniam-service-desk:$version # FIDM @@ -145,7 +145,7 @@ podman run \ --no-hosts \ --network=slirp4netns:allow_host_loopback=true \ --entrypoint='["/bin/bash","/run-ct.sh","php-fpm"]' \ - $repository/fusioniam-centos8-fusiondirectory:$version + $repository/fusioniam-fusiondirectory:$version podman run \ --env-file=$script_path/ENVVAR.example \ @@ -156,7 +156,7 @@ podman run \ --detach=true \ --no-hosts \ --entrypoint='["/bin/bash","/run-ct.sh","nginx"]' \ - $repository/fusioniam-centos8-fusiondirectory:$version + $repository/fusioniam-fusiondirectory:$version # Display logs