diff --git a/roles/keycloak/vars/main.yml b/roles/keycloak/vars/main.yml index d84439c..aae7234 100644 --- a/roles/keycloak/vars/main.yml +++ b/roles/keycloak/vars/main.yml @@ -40,10 +40,6 @@ keycloak_docker: { "JAVA_OPTS_APPEND: \"-Dkeycloak.profile.feature.docker=enabled\"", ], - volumes: [ - '"./eden-theme:/opt/jboss/keycloak/themes/eden-theme:ro"', - '"./smardigo-theme:/opt/jboss/keycloak/themes/smardigo-theme:ro"', - ], networks: [ '"front-tier"', ], diff --git a/roles/pdns/defaults/main.yml b/roles/pdns/defaults/main.yml index 959e27a..8c1bdf0 100644 --- a/roles/pdns/defaults/main.yml +++ b/roles/pdns/defaults/main.yml @@ -1,10 +1,10 @@ --- -pdns_image_name: "dev-docker-registry-01.smardigo.digital/smardigo/pdns-authoritative" +pdns_image_name: "{{ shared_service_docker_registry_hostname }}/smardigo/pdns-authoritative" pdns_image_version: "1.0.0" -pdns_recursor_image_name: "dev-docker-registry-01.smardigo.digital/smardigo/pdns-recursor" +pdns_recursor_image_name: "{{ shared_service_docker_registry_hostname }}/smardigo/pdns-recursor" pdns_recursor_image_version: "1.0.0" pdns_admin_image_name: "ngoduykhanh/powerdns-admin" -pdns_admin_image_version: "0.2.2" +pdns_admin_image_version: "0.2.4" diff --git a/roles/pdns/tasks/main.yml b/roles/pdns/tasks/main.yml index c746b1c..b983fb7 100644 --- a/roles/pdns/tasks/main.yml +++ b/roles/pdns/tasks/main.yml @@ -22,10 +22,12 @@ - name: "Copy /run/systemd/resolve/stub-resolv.conf" ansible.builtin.copy: src: "/run/systemd/resolve/stub-resolv.conf" + remote_src: true dest: "/etc/resolv.conf" owner: root group: root mode: '0644' + when: link.stat.islnk is defined and link.stat.islnk - name: Adding 8.8.8.8 as fallback to resolv.conf ansible.builtin.lineinfile: diff --git a/templates/keycloak/smardigo-theme/account/resources/css/smardigo-account.css b/templates/keycloak/smardigo-theme/account/resources/css/smardigo-account.css deleted file mode 100644 index 84e4e99..0000000 --- a/templates/keycloak/smardigo-theme/account/resources/css/smardigo-account.css +++ /dev/null @@ -1,39 +0,0 @@ -.navbar-title { - background-color: #ffffff; - background-image: url('../img/smardigo-logo.png'); - height: 30px; - width: 171px; -} - -.navbar-pf { - border-top-color: #ffffff; - border-bottom-color: #b02d3f; - background: #ffffff; - border-bottom-width: 3px; -} - -.navbar-pf .navbar-header { - border-color: #b02d3f; -} - -.bs-sidebar ul li.active a { - color: #ffffff; - border-color: #b02d3f; - background-color: #b02d3f; -} - -.btn-primary { - background-color: #b02d3f; - border-color: #b02d3f; - background-image: linear-gradient(to bottom,#b02d3f 0,#b02d3f 100%); - background-repeat: repeat-x; -} - -.btn-primary.active, .btn-primary:active, .btn-primary:focus, .btn-primary:hover, .open .dropdown-toggle.btn-primary { - background-color: #b02d3f; - border-color: #b02d3f; -} - -.navbar-pf .navbar-utility > li > a { - color: #000000 !important; -} diff --git a/templates/keycloak/smardigo-theme/account/resources/img/favicon.ico b/templates/keycloak/smardigo-theme/account/resources/img/favicon.ico deleted file mode 100644 index 0333bfb..0000000 Binary files a/templates/keycloak/smardigo-theme/account/resources/img/favicon.ico and /dev/null differ diff --git a/templates/keycloak/smardigo-theme/account/resources/img/smardigo-logo.png b/templates/keycloak/smardigo-theme/account/resources/img/smardigo-logo.png deleted file mode 100644 index 21b7d1f..0000000 Binary files a/templates/keycloak/smardigo-theme/account/resources/img/smardigo-logo.png and /dev/null differ diff --git a/templates/keycloak/smardigo-theme/account/theme.properties b/templates/keycloak/smardigo-theme/account/theme.properties deleted file mode 100644 index 21591a5..0000000 --- a/templates/keycloak/smardigo-theme/account/theme.properties +++ /dev/null @@ -1,4 +0,0 @@ -parent=keycloak -import=common/keycloak - -styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css css/account.css css/smardigo-account.css diff --git a/templates/keycloak/smardigo-theme/admin/resources/css/smardigo-styles.css b/templates/keycloak/smardigo-theme/admin/resources/css/smardigo-styles.css deleted file mode 100644 index 30c1572..0000000 --- a/templates/keycloak/smardigo-theme/admin/resources/css/smardigo-styles.css +++ /dev/null @@ -1,17 +0,0 @@ -.navbar-pf { - background: #ffffff; -} - -.navbar-pf .navbar-brand { - background-image: url('../img/smardigo-logo.png'); - background-size: 171px 30px; - width: 171px; -} - -.navbar-pf .navbar-header { - border-bottom: 1px solid #b02d3f; -} - -.navbar-pf .navbar-utility .dropdown-toggle { - color: #000000!important; -} \ No newline at end of file diff --git a/templates/keycloak/smardigo-theme/admin/resources/img/favicon.ico b/templates/keycloak/smardigo-theme/admin/resources/img/favicon.ico deleted file mode 100644 index 0333bfb..0000000 Binary files a/templates/keycloak/smardigo-theme/admin/resources/img/favicon.ico and /dev/null differ diff --git a/templates/keycloak/smardigo-theme/admin/resources/img/smardigo-logo.png b/templates/keycloak/smardigo-theme/admin/resources/img/smardigo-logo.png deleted file mode 100644 index 21b7d1f..0000000 Binary files a/templates/keycloak/smardigo-theme/admin/resources/img/smardigo-logo.png and /dev/null differ diff --git a/templates/keycloak/smardigo-theme/admin/theme.properties b/templates/keycloak/smardigo-theme/admin/theme.properties deleted file mode 100644 index 2dd7826..0000000 --- a/templates/keycloak/smardigo-theme/admin/theme.properties +++ /dev/null @@ -1,4 +0,0 @@ -parent=keycloak -import=common/keycloak - -styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css node_modules/select2/select2.css lib/angular/treeview/css/angular.treeview.css node_modules/text-security/text-security.css css/styles.css css/smardigo-styles.css diff --git a/templates/keycloak/smardigo-theme/login/resources/css/smardigo-login.css b/templates/keycloak/smardigo-theme/login/resources/css/smardigo-login.css deleted file mode 100644 index d6df3f9..0000000 --- a/templates/keycloak/smardigo-theme/login/resources/css/smardigo-login.css +++ /dev/null @@ -1,59 +0,0 @@ -/* Zentrieren der Login-Box */ -.login-pf-page { - position: relative; - top: 40%; /* erst oben 40% frei lassen (50% wäre exakt zentrieren, 40% sieht aber besser aus)*/ - transform: translateY(-50%); /* dann die Box um die halbe Höhe hochschieben */ -} - -.login-pf body { - background: none; /* entfernen des Keycloak-Theme-Hintergrundes... */ - background-color: #f3f5f7; /* ...dahinter ist noch ein STandard-Hintergrundbild, das verschwindet, wenn man hier eine Farbe setzt. (merkwürdig...) */ -} - -.login-pf-page .login-pf-header h1 { - font-size: 24px; - font-weight: bold; - text-align: left; -} - -.login-pf-page .card-pf { - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); -} - -#kc-header { - background-image: url("../img/smardigo-logo.png"); - background-size: contain; - background-repeat: no-repeat; - background-position: center; -} - -/* Keycloak-Client-Name verstecken, stattdessen wird unser Smardigo-Logo angezeigt */ -#kc-header-wrapper { - visibility: hidden; -} - -.btn-primary { - background-image: linear-gradient(to bottom,#006a68 0,#006a68 100%); - border-color: #006a68; -} - -.btn-primary.active, .btn-primary:active, .btn-primary:focus, .btn-primary:hover, .open .dropdown-toggle.btn-primary, btn-lg { - background-color: #b02d3f; - border-color: #b02d3f; -} - -.form-control:hover { - border-color: #b02d3f; -} - -.form-control:focus { - border-color: #b02d3f; -} - -.card-pf { - border-top-color: #b02d3f; -} - -.pf-m-primary { - background-color: #b02d3f!important; -} \ No newline at end of file diff --git a/templates/keycloak/smardigo-theme/login/resources/img/favicon.ico b/templates/keycloak/smardigo-theme/login/resources/img/favicon.ico deleted file mode 100644 index 0333bfb..0000000 Binary files a/templates/keycloak/smardigo-theme/login/resources/img/favicon.ico and /dev/null differ diff --git a/templates/keycloak/smardigo-theme/login/resources/img/smardigo-logo.png b/templates/keycloak/smardigo-theme/login/resources/img/smardigo-logo.png deleted file mode 100644 index 7b8111d..0000000 Binary files a/templates/keycloak/smardigo-theme/login/resources/img/smardigo-logo.png and /dev/null differ diff --git a/templates/keycloak/smardigo-theme/login/theme.properties b/templates/keycloak/smardigo-theme/login/theme.properties deleted file mode 100644 index 85b8cc5..0000000 --- a/templates/keycloak/smardigo-theme/login/theme.properties +++ /dev/null @@ -1,4 +0,0 @@ -parent=keycloak -import=common/keycloak - -styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css lib/zocial/zocial.css css/login.css css/tile.css css/smardigo-login.css \ No newline at end of file