From 54ed9c8c41a224fa730f89bcda6fb392f9b78f6b Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sun, 24 Sep 2006 14:34:53 +0000 Subject: [PATCH] bweb not brestore needs to add dataowner to group apache, add xsu and consolehelper support to spec. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3496 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bacula-gui.spec.in | 27 ++++++++++++++++++--- gui/brestore/brestore.console_apps | 3 +++ gui/brestore/brestore.desktop.consolehelper | 11 +++++++++ gui/brestore/brestore.desktop.xsu | 11 +++++++++ gui/brestore/brestore.pamd | 7 ++++++ 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 gui/brestore/brestore.console_apps create mode 100644 gui/brestore/brestore.desktop.consolehelper create mode 100644 gui/brestore/brestore.desktop.xsu create mode 100644 gui/brestore/brestore.pamd diff --git a/gui/bacula-gui.spec.in b/gui/bacula-gui.spec.in index 33c3884051..1bee9896e7 100644 --- a/gui/bacula-gui.spec.in +++ b/gui/bacula-gui.spec.in @@ -192,6 +192,11 @@ chmod 750 $RPM_BUILD_ROOT/etc/bweb mkdir -p $RPM_BUILD_ROOT/usr/share/bweb/tpl mkdir -p $RPM_BUILD_ROOT%{docdir}/%{bweb} +%if !%{suse} +mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps +mkdir -p $RPM_BUILD_ROOT/etc/pam.d +%endif + # install bimagemgr files cp -p %{bimagemgr}-%{version}/bimagemgr.pl $RPM_BUILD_ROOT%{cgidir}/ cp -p %{bimagemgr}-%{version}/config.pm $RPM_BUILD_ROOT%{cgidir}/ @@ -222,7 +227,14 @@ chmod 644 $RPM_BUILD_ROOT%{perl_site_arch}/*.pm # install the brestore files cp -p %{brestore}-%{version}/brestore.pl $RPM_BUILD_ROOT/usr/bin/ cp -p %{brestore}-%{version}/brestore.glade $RPM_BUILD_ROOT/usr/share/brestore/ -cp -p %{brestore}-%{version}/brestore.desktop $RPM_BUILD_ROOT/usr/share/applications/ +%if %{suse} +cp -p %{brestore}-%{version}/brestore.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/brestore.desktop +%else +cp -p %{brestore}-%{version}/brestore.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/brestore.desktop +cp -p brestore.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/brestore +cp -p brestore.pamd $RPM_BUILD_ROOT/etc/pam.d/brestore +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/brestore +%endif cp -p %{brestore}-%{version}/brestore.png $RPM_BUILD_ROOT/usr/share/pixmaps/ chmod 755 $RPM_BUILD_ROOT/usr/bin/brestore.pl chmod 644 $RPM_BUILD_ROOT/usr/share/brestore/brestore.glade @@ -327,6 +339,12 @@ rm -rf docs /usr/share/applications/brestore.desktop /usr/share/pixmaps/brestore.png %doc docs/%{brestore}/* +%if !%{suse} +# add the console helper files +%config(noreplace,missingok) /etc/pam.d/brestore +%config(noreplace,missingok) /etc/security/console.apps/brestore +/usr/bin/brestore +%endif %files bweb %defattr(-,%{binowner},%{bingroup}) @@ -362,7 +380,7 @@ echo "You should remove user %{dataowner} from group bacula." echo %endif -%post brestore +%post bweb %if %{suse} # add the web server user to group bacula %{groupmod} -A %{dataowner} bacula @@ -372,7 +390,7 @@ cp -p %{groupfile} %{groupfile}.old awk '{if (/bacula:/) print $0",%{dataowner}"; else print $0}' %{groupfile}.old > %{groupfile} %endif -%postun brestore +%postun bweb %if %{suse} # remove the web server user to group bacula %{groupmod} -R %{dataowner} bacula @@ -383,6 +401,9 @@ echo %endif %changelog +* Sun Sep 24 2006 D. Scott Barninger +- it's bweb not brestore that needs to add dataowner to group bacula +- brestore will need to run xsu or usermod * Sun Sep 03 2006 D. Scott Barninger - seems that groupmod -A or -R is only available on SuSE - use awk or add warning for other platforms diff --git a/gui/brestore/brestore.console_apps b/gui/brestore/brestore.console_apps new file mode 100644 index 0000000000..2630d85661 --- /dev/null +++ b/gui/brestore/brestore.console_apps @@ -0,0 +1,3 @@ +USER=root +PROGRAM=/usr/bin/brestore.pl +SESSION=true diff --git a/gui/brestore/brestore.desktop.consolehelper b/gui/brestore/brestore.desktop.consolehelper new file mode 100644 index 0000000000..70c78aacad --- /dev/null +++ b/gui/brestore/brestore.desktop.consolehelper @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Brestore +Comment=Bacula Restoration GUI +Icon=/usr/share/pixmaps/brestore.png +Exec=/usr/bin/brestore +Terminal=false +Type=Application +Encoding=UTF-8 +X-Desktop-File-Install-Version=0.3 +Categories=System;Application;Utility; +StartupNotify=true diff --git a/gui/brestore/brestore.desktop.xsu b/gui/brestore/brestore.desktop.xsu new file mode 100644 index 0000000000..37bc2a2831 --- /dev/null +++ b/gui/brestore/brestore.desktop.xsu @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Brestore +Comment=Bacula Restoration GUI +Icon=/usr/share/pixmaps/brestore.png +Exec=gnomesu -t "Query" -c "/usr/bin/brestore.pl" -d -e -m "In order to run the bacula restore gui as root, ^additional information is required." +Terminal=false +Type=Application +Encoding=UTF-8 +X-Desktop-File-Install-Version=0.3 +Categories=System;Application;Utility; +StartupNotify=true diff --git a/gui/brestore/brestore.pamd b/gui/brestore/brestore.pamd new file mode 100644 index 0000000000..15cb90fa87 --- /dev/null +++ b/gui/brestore/brestore.pamd @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so -- 2.39.5