Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rpm-icingaweb2-module-x509
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
packaging
rpm-icingaweb2-module-x509
Commits
3a0ce44e
Commit
3a0ce44e
authored
5 years ago
by
Markus Frosch
Browse files
Options
Downloads
Patches
Plain Diff
Use correct username for service
parent
2d4827d3
Branches
master
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#22494
failed
3 years ago
Stage: build
Stage: test
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
icinga-x509.service
+1
-1
1 addition, 1 deletion
icinga-x509.service
icingaweb2-module-x509.spec
+9
-0
9 additions, 0 deletions
icingaweb2-module-x509.spec
with
10 additions
and
1 deletion
icinga-x509.service
+
1
−
1
View file @
3a0ce44e
...
@@ -3,7 +3,7 @@ Description=Icinga Certificate Monitoring Module Jobs Runner
...
@@ -3,7 +3,7 @@ Description=Icinga Certificate Monitoring Module Jobs Runner
[Service]
[Service]
Type
=
simple
Type
=
simple
User
=
icingaweb2
User
=
apache
ExecStart
=
/usr/bin/icingacli x509 jobs run
ExecStart
=
/usr/bin/icingacli x509 jobs run
Restart
=
on-success
Restart
=
on-success
...
...
This diff is collapsed.
Click to expand it.
icingaweb2-module-x509.spec
+
9
−
0
View file @
3a0ce44e
...
@@ -20,6 +20,12 @@ BuildArch: noarch
...
@@ -20,6 +20,12 @@ BuildArch: noarch
%global basedir %{_datadir}/icingaweb2/modules/%{module_name}
%global basedir %{_datadir}/icingaweb2/modules/%{module_name}
%global service_name icinga-%{module_name}
%global service_name icinga-%{module_name}
%if "%{_vendor}" == "suse"
%global service_user wwwrun
%else # suse
%global service_user apache
%endif # suse
BuildRequires: systemd-devel
BuildRequires: systemd-devel
Requires: systemd
Requires: systemd
...
@@ -58,6 +64,9 @@ cp -r * %{buildroot}%{basedir}
...
@@ -58,6 +64,9 @@ cp -r * %{buildroot}%{basedir}
install -d %{buildroot}%{_unitdir}
install -d %{buildroot}%{_unitdir}
install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{service_name}.service
install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{service_name}.service
# Replace user in service unit
sed -i -e 's~^User=.*~User=%{service_user}~' %{buildroot}%{_unitdir}/%{service_name}.service
%if "%{_vendor}" == "suse"
%if "%{_vendor}" == "suse"
install -d %{buildroot}%{_sbindir}
install -d %{buildroot}%{_sbindir}
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{service_name}
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{service_name}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment