Skip to content

Commit

Permalink
🔄 synced file(s) with pimcore/sync-common-files (#14)
Browse files Browse the repository at this point in the history
* 🔄 synced file(s) with pimcore/sync-common-files

* readd dockerized processor

* Update config.yaml

---------

Co-authored-by: JiaJia Ji <kingjia90@gmail.com>
  • Loading branch information
brusch and kingjia90 authored May 16, 2023
1 parent b31e54b commit fd55613
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .github/ci/files/.my.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
host=127.0.0.1
port=33006
user=root
password=
password=
5 changes: 5 additions & 0 deletions .github/ci/files/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ imports:
- { resource: services.yaml }
- { resource: system.yml }

pimcore_web_to_print:
config_location:
web_to_print:
write_target:
type: 'settings-store'
3 changes: 3 additions & 0 deletions .github/ci/files/config/packages/security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ security:
pimcore_admin:
id: Pimcore\Security\User\UserProvider


firewalls:
dev:
pattern: ^/(_(profiler|wdt)|css|images|js)/
Expand All @@ -19,6 +20,7 @@ security:
# Pimcore Admin Bundle firewall
pimcore_admin: '%pimcore_admin_bundle.firewall_settings%'


access_control:
# Pimcore admin ACl // DO NOT CHANGE!
- { path: ^/admin/settings/display-custom-logo, roles: PUBLIC_ACCESS }
Expand All @@ -30,6 +32,7 @@ security:
- { path: ^/admin, roles: ROLE_PIMCORE_USER }
- { path: ^/asset/webdav, roles: ROLE_PIMCORE_USER }


role_hierarchy:
# Pimcore admin // DO NOT CHANGE!
ROLE_PIMCORE_ADMIN: [ROLE_PIMCORE_USER]
55 changes: 0 additions & 55 deletions .github/ci/files/config/system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ pimcore:
default: /error
allow_trailing_slash: 'no'
generate_preview: true
type_definitions:
map:
printpage:
class: Pimcore\Bundle\WebToPrintBundle\Model\Document\Printpage
children_supported: false
direct_route: true
predefined_document_types: true
printcontainer:
class: Pimcore\Bundle\WebToPrintBundle\Model\Document\Printcontainer
only_printable_childrens: true
direct_route: true
predefined_document_types: true
objects:
versions:
days: null
Expand Down Expand Up @@ -72,51 +60,8 @@ pimcore:
uri: '%env(PIMCORE_TEST_CHROMIUM_DNS)%'
gotenberg:
base_url: '%env(PIMCORE_TEST_GOTENBERG_DNS)%'
config_location:
image_thumbnails:
write_target:
type: 'settings-store'
video_thumbnails:
write_target:
type: 'settings-store'
document_types:
write_target:
type: 'settings-store'
predefined_properties:
write_target:
type: 'settings-store'
predefined_asset_metadata:
write_target:
type: 'settings-store'
perspectives:
write_target:
type: 'settings-store'
custom_views:
write_target:
type: 'settings-store'
object_custom_layouts:
write_target:
type: 'settings-store'
system_settings:
write_target:
type: 'symfony-config'
read_target:
type: 'symfony-config'

pimcore_admin:
branding:
color_login_screen: ''
color_admin_interface: ''
login_screen_custom_image: ''
config_location:
admin_system_settings:
write_target:
type: 'settings-store'
read_target:
type: 'settings-store'

pimcore_web_to_print:
config_location:
web_to_print:
write_target:
type: 'settings-store'
8 changes: 1 addition & 7 deletions .github/ci/files/kernel/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,9 @@

namespace App;

use Pimcore\Bundle\AdminBundle\PimcoreAdminBundle;
use Pimcore\HttpKernel\BundleCollection\BundleCollection;
use Pimcore\Kernel as BaseKernel;

class Kernel extends BaseKernel
{
public function registerBundlesToCollection(BundleCollection $collection): void
{
// pimcore bundles
$collection->addBundle(new PimcoreAdminBundle(), 60);
}

}

0 comments on commit fd55613

Please sign in to comment.