diff options
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | cobbler.spec | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 | ||||
| -rw-r--r-- | config/.htpasswd | 1 | ||||
| -rw-r--r-- | docs/cobbler.pod | 19 | ||||
| -rw-r--r-- | setup.py | 2 |
6 files changed, 21 insertions, 9 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 3b4a785..5b03510 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,7 +11,7 @@ include config/modules.conf include config/auth.conf include config/webui-cherrypy.cfg include config/settings -include config/.htaccess +include config/.htpasswd recursive-include templates *.template recursive-include kickstarts *.ks include docs/cobbler.1.gz diff --git a/cobbler.spec b/cobbler.spec index a1ac739..d353d93 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -143,7 +143,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT /etc/init.d/cobblerd %config(noreplace) /etc/httpd/conf.d/cobbler.conf %config(noreplace) /etc/httpd/conf.d/cobbler_webui.conf -%config(noreplace) /var/www/cgi-bin/cobbler/.htaccess +%config(noreplace) /var/www/cgi-bin/cobbler/.htpasswd %dir /var/log/cobbler/syslog %defattr(755,root,root) diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 7717496..d8b5f2b 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0rc8' __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1193690680.709156 -__CHEETAH_genTimestamp__ = 'Mon Oct 29 16:44:40 2007' +__CHEETAH_genTime__ = 1193694568.5778069 +__CHEETAH_genTimestamp__ = 'Mon Oct 29 17:49:28 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Mon Oct 29 16:39:12 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' diff --git a/config/.htpasswd b/config/.htpasswd new file mode 100644 index 0000000..310327a --- /dev/null +++ b/config/.htpasswd @@ -0,0 +1 @@ +cobbler:Cobbler WebUI Authentication:4551d917d1d3698954a91686ceb14f3a diff --git a/docs/cobbler.pod b/docs/cobbler.pod index e46415a..c0682f1 100644 --- a/docs/cobbler.pod +++ b/docs/cobbler.pod @@ -659,14 +659,25 @@ Cobbler also makes itself available as a Python API for use by higher level mana =head2 WEB USER INTERFACE -Most of the day-to-day actions in cobbler's command line can be performed in Cobbler's Web UI. To enable the WebUI, set xmlrpc_rw_enabled to 1 in /var/lib/cobbler/settings, add some users in /etc/cobbler/auth.conf, and do a /sbin/service cobblerd restart. +Most of the day-to-day actions in cobbler's command line can be performed in Cobbler's Web UI. To enable and access the WebUI, perform the following steps. -SELinux users may also have to run: +1) Set xmlrpc_rw_enabled to 1 in /var/lib/cobbler/settings to enable network control. -"setsebool httpd_can_network_connect true" +2) Change the admin xmlrpc secret in /etc/cobbler/auth.conf. You won't have to remember it. -Users can then log-in at http://bootserver.example.org/cgi-bin/cobbler/webui.cgi. +3) The default Web UI password is "cobbler/ILoveCobbler", to change this, run: +htdigest /var/www/cgi-bin/cobbler/.htaccess "Cobbler WebUI Authentication" cobbler + +4) SELinux users may also have to run: + +setsebool httpd_can_network_connect true + +chcon httpd_sys_content_t /etc/cobbler/auth.conf + +5) Run /sbin/service cobblerd restart. + +6) Visit http://yourserver.example.org/cgi-bin/cobbler/webui.cgi and log in with whatever you chose in step 3. =head1 EXIT_STATUS @@ -64,7 +64,7 @@ if __name__ == "__main__": (cgipath, ['scripts/webui.cgi']), # miscellaneous config files - (cgipath, ['config/.htaccess']), + (cgipath, ['config/.htpasswd']), (rotpath, ['config/cobblerd_rotate']), (wwwconf, ['config/cobbler.conf','config/cobbler_webui.conf']), (cobpath, ['config/cobbler_hosts']), |