Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add prod dirs via .gitkeep #174

Merged
merged 1 commit into from
Aug 10, 2021
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
11 changes: 4 additions & 7 deletions rpm_spec/manageiq.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,15 @@ cd %{_builddir}
### from core
%{__mkdir} -p %{buildroot}%{app_root}
%{__cp} -a %{core_builddir}/* %{buildroot}%{app_root}
%{__mkdir} -p %{buildroot}%{app_root}/log/apache
%{__mkdir} -p %{buildroot}%{app_root}/tmp/{,sockets,pids}
%{__chmod} 6750 %{buildroot}%{app_root}/{log,config,certs,data,data/git_repos}
%{__chmod} 700 %{buildroot}%{app_root}/tmp/{,pids,sockets}

### from appliance
%{__mkdir} -p %{buildroot}%{appliance_root}
%{__cp} -a %{appliance_builddir}/* %{buildroot}%{appliance_root}
%{__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} 700 %{buildroot}%{app_root}/tmp/{,pids,sockets}
%{__chmod} 755 %{buildroot}%{app_root}/public/pictures

### from gemset
%{__mkdir} -p %{buildroot}%{gemset_root}
Expand Down
3 changes: 3 additions & 0 deletions rpm_spec/subpackages/manageiq-core
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ 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
%{__chown} -r manageiq.manageiq %{app_root}/data/
%{__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
Expand All @@ -53,8 +54,10 @@ 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
%exclude %{app_root}/public/ui
%exclude %{app_root}/public/upload
%exclude %{app_root}/log/apache
8 changes: 7 additions & 1 deletion rpm_spec/subpackages/manageiq-ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@ Requires: mod_ssl
%description ui
%{product_summary} UI

%post ui
# These files are not owned by the rpm.
# For upgrades, ensure they have the correct group privs
# so root and manageiq users can read them.
%{__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