Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand 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',
Expand Down
9 changes: 3 additions & 6 deletions manifests/setup.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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':
Expand Down
3 changes: 0 additions & 3 deletions spec/classes/katello_devel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]) }

Expand All @@ -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',
Expand Down
1 change: 0 additions & 1 deletion templates/env.erb
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions templates/settings.yaml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down