Skip to content

Commit

Permalink
add prod dirs
Browse files Browse the repository at this point in the history
These directories are created in the core repo
The rpm is making them writeable by user manageiq so the app
will run fine as a non-root user

add prod dirs

These directories are created in the core repo (via .gitkeep)
no need to create them here.

The rpm is making them writeable by user manageiq so the app
will run fine as a non-root user

No longer locking down the files that are in these directories because
the directories are not accessible by other, therefore files are not either.
  • Loading branch information
kbrock committed Aug 4, 2021
1 parent a626067 commit 2112d1e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 2 additions & 4 deletions rpm_spec/manageiq.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@ cd %{_builddir}
%{__mkdir} -p %{buildroot}/etc/httpd/conf.d
%{__mkdir} -p %{buildroot}%{app_root}/log/apache
%{__mkdir} -p %{buildroot}%{app_root}/tmp/{,sockets,pids}
%{__mkdir} -p %{buildroot}%{app_root}/{certs,config}
%{__mkdir} -p %{buildroot}%{app_root}/public/pictures
%{__chmod} 4750 %{buildroot}%{app_root}/{log,config,certs}
%{__chmod} 6750 %{buildroot}%{app_root}/{log,config,certs}
%{__chmod} 6750 %{buildroot}%{app_root}/data/git_repos
%{__chmod} 700 %{buildroot}%{app_root}/tmp/{,pids,sockets}
%{__chmod} 755 %{buildroot}%{app_root}/public/pictures

### from gemset
%{__mkdir} -p %{buildroot}%{gemset_root}
Expand Down
4 changes: 1 addition & 3 deletions rpm_spec/subpackages/manageiq-core
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ done
# so root and manageiq users can read them.
%{__chown} manageiq.manageiq %{app_root}/certs/v2_key %{app_root}/log/*.log
%{__chown} manageiq.manageiq %{app_root}/tmp/pids/*.pid %{app_root}/config/*.yml
%{__chmod} o-rw %{app_root}/certs/v2_key
%{__chmod} o-rw %{app_root}/config/*.yml %{app_root}/tmp/pids/*.pid
%{__chmod} o-rw %{app_root}/log/*.log

%files core
%defattr(-,root,root,-)
Expand All @@ -53,6 +50,7 @@ done
%attr(-,manageiq,manageiq) %{app_root}/config
%attr(-,manageiq,manageiq) %{app_root}/log
%attr(-,manageiq,manageiq) %{app_root}/tmp
%attr(-,manageiq,manageiq) %{app_root}/data/git_repos
%exclude %{app_root}/public/pictures
%exclude %{app_root}/public/assets
%exclude %{app_root}/public/packs
Expand Down
6 changes: 5 additions & 1 deletion rpm_spec/subpackages/manageiq-ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ Requires: mod_ssl
%description ui
%{product_summary} UI

%post ui
%{__chown} manageiq.manageiq %{app_root}/data/git_repos/*
%{__chown} manageiq.manageiq %{app_root}/public/{pictures,upload}/*

%files ui
%defattr(-,root,root,-)
%attr(-,manageiq,manageiq) %{app_root}/public/pictures
%{app_root}/public/pictures
%attr(-,manageiq,manageiq) %{app_root}/public/upload
%{app_root}/public/assets
%{app_root}/public/packs
%{app_root}/public/ui
Expand Down

0 comments on commit 2112d1e

Please sign in to comment.