diff --git a/manifests/init.pp b/manifests/init.pp index 94ccfd5..c0127da 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,9 +15,6 @@ # @param post_sync_token # The shared secret for pulp notifying katello about completed syncs # -# @param webpack_dev_server -# Whether to use the webpack dev server. Otherwise uses statically compiled -# bundles. # # @param modulestream_nodejs # The nodejs modularity stream to use on EL8 and up @@ -82,7 +79,6 @@ String $oauth_key = $katello_devel::params::oauth_key, String $oauth_secret = $katello_devel::params::oauth_secret, String $post_sync_token = 'test', - Boolean $webpack_dev_server = true, String $modulestream_nodejs = '18', Boolean $manage_bundler = true, String $initial_organization = 'Default Organization', diff --git a/manifests/setup.pp b/manifests/setup.pp index 9410a4b..62ed086 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -6,7 +6,6 @@ String $initial_organization = $katello_devel::initial_organization, String $initial_location = $katello_devel::initial_location, String $admin_password = $katello_devel::admin_password, - Boolean $webpack_dev_server = $katello_devel::webpack_dev_server, Integer[0] $npm_timeout = $katello_devel::npm_timeout, ) { $pidfile = "${foreman_dir}/tmp/pids/server.pid" @@ -17,11 +16,9 @@ "SEED_ADMIN_PASSWORD=${admin_password}", ] - unless $webpack_dev_server { - katello_devel::bundle { 'exec rake webpack:compile': - require => Katello_devel::Bundle['exec npm install'], - before => Katello_devel::Bundle['exec rake db:migrate'], - } + katello_devel::bundle { 'exec rake webpack:compile': + require => Katello_devel::Bundle['exec npm install'], + before => Katello_devel::Bundle['exec rake db:migrate'], } katello_devel::bundle { 'install --retry 3 --jobs 3 --path .vendor': diff --git a/spec/classes/katello_devel_spec.rb b/spec/classes/katello_devel_spec.rb index 5db6455..e479fe5 100644 --- a/spec/classes/katello_devel_spec.rb +++ b/spec/classes/katello_devel_spec.rb @@ -32,7 +32,6 @@ 'BIND=0.0.0.0', 'PORT=3000', "RAILS_STARTUP='puma -w 2 -p $PORT --preload'", - "WEBPACK_OPTS='--https --key /etc/pki/katello/private/katello-apache.key --cert /etc/pki/katello/certs/katello-apache.crt --cacert /etc/pki/katello/certs/katello-default-ca.crt --host 0.0.0.0 --public #{facts[:networking]['fqdn']}'", "REDUX_LOGGER=false", ]) } @@ -53,8 +52,6 @@ ':ssl_client_dn_env: HTTP_SSL_CLIENT_S_DN', ':ssl_client_verify_env: HTTP_SSL_CLIENT_VERIFY', ':ssl_client_cert_env: HTTP_SSL_CLIENT_CERT', - ':webpack_dev_server: true', - ':webpack_dev_server_https: true', ':assets_debug: false', ':rails_cache_store:', ' :type: redis', diff --git a/templates/env.erb b/templates/env.erb index 60f2d6a..719b7f6 100644 --- a/templates/env.erb +++ b/templates/env.erb @@ -1,5 +1,4 @@ BIND=0.0.0.0 PORT=<%= scope['katello_devel::rails_port'] %> RAILS_STARTUP='<%= scope['katello_devel::rails_command'] %>' -WEBPACK_OPTS='--https --key <%= scope['certs::apache::apache_key'] %> --cert <%= scope['certs::apache::apache_cert'] %> --cacert <%= scope['certs::apache::apache_client_ca_cert'] %> --host 0.0.0.0 --public <%= scope['certs::apache::hostname'] %>' REDUX_LOGGER=false diff --git a/templates/settings.yaml.erb b/templates/settings.yaml.erb index 4bc8011..32fbe7b 100644 --- a/templates/settings.yaml.erb +++ b/templates/settings.yaml.erb @@ -23,9 +23,7 @@ :ssl_client_verify_env: HTTP_SSL_CLIENT_VERIFY :ssl_client_cert_env: HTTP_SSL_CLIENT_CERT -# webpack dev server settings -:webpack_dev_server: <%= scope['::katello_devel::webpack_dev_server'] %> -:webpack_dev_server_https: true +# Debug mode disables concatenation and preprocessing of assets. :assets_debug: false # Rails Cache type