diff options
| author | James Laska <jlaska@redhat.com> | 2009-03-09 12:04:01 -0400 |
|---|---|---|
| committer | James Laska <jlaska@redhat.com> | 2009-03-09 12:04:15 -0400 |
| commit | 6bbb8d0bfaf347dc1e0d347db1ccb68a55804220 (patch) | |
| tree | 66cb4a505d6bb1507150157b9c63c29daf94b7f5 | |
| parent | d278d86e8109a9c26241f80806bd9b54f3e387f7 (diff) | |
| download | cobbler-6bbb8d0bfaf347dc1e0d347db1ccb68a55804220.tar.gz cobbler-6bbb8d0bfaf347dc1e0d347db1ccb68a55804220.tar.xz cobbler-6bbb8d0bfaf347dc1e0d347db1ccb68a55804220.zip | |
Rename anamon.py -> anamon
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | aux/anamon (renamed from aux/anamon.py) | 0 | ||||
| -rw-r--r-- | aux/anamon.init | 6 | ||||
| -rw-r--r-- | cobbler.spec | 6 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | snippets/post_anamon | 6 | ||||
| -rw-r--r-- | snippets/pre_anamon | 4 |
7 files changed, 12 insertions, 14 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 22e55a70..6532779e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -19,7 +19,7 @@ include config/users.conf include config/completions include config/cobbler_bash include config/cheetah_macros -include aux/anamon.py +include aux/anamon include aux/anamon.init recursive-include templates *.template recursive-include installer_templates *.template defaults diff --git a/aux/anamon.py b/aux/anamon index fe4d0eb6..fe4d0eb6 100644 --- a/aux/anamon.py +++ b/aux/anamon diff --git a/aux/anamon.init b/aux/anamon.init index b2fd9828..d029c881 100644 --- a/aux/anamon.init +++ b/aux/anamon.init @@ -48,7 +48,7 @@ fi start() { echo -n $"Starting anamon: " - daemon /usr/local/sbin/anamon.py --watchfile \"$LOGFILES\" --name $COBBLER_NAME --server $COBBLER_SERVER --port ${COBBLER_PORT:-80} --exit + daemon /usr/local/sbin/anamon --watchfile \"$LOGFILES\" --name $COBBLER_NAME --server $COBBLER_SERVER --port ${COBBLER_PORT:-80} --exit RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCKFILE echo @@ -61,7 +61,7 @@ start() { stop () { echo -n $"Shutting down anamon: " - killproc /usr/local/sbin/anamon.py + killproc /usr/local/sbin/anamon RETVAL=$? [ $RETVAL -eq 0 ] && rm -f $LOCKFILE echo @@ -89,7 +89,7 @@ case "$1" in fi ;; status) - status anamon.py + status anamon RETVAL=$? ;; *) diff --git a/cobbler.spec b/cobbler.spec index 33033e93..73a39f14 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -165,10 +165,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %dir /var/www/cobbler/aux %defattr(444,apache,apache) /var/www/cobbler/webui/* -%ghost /var/www/cobbler/aux/anamon.pyc -%ghost /var/www/cobbler/aux/anamon.pyo -/var/www/cobbler/aux/*.py -/var/www/cobbler/aux/*.init +/var/www/cobbler/aux/anamon +/var/www/cobbler/aux/anamon.init %defattr(755,root,root) %{_bindir}/cobbler @@ -331,7 +331,7 @@ if __name__ == "__main__": (wwwcon, ['webui_content/cobblerweb.css']), # Anamon script - (vw_aux, ['aux/anamon.py', 'aux/anamon.init']), + (vw_aux, ['aux/anamon', 'aux/anamon.init']), # Directories to hold cobbler triggers ("%s/add/distro/pre" % trigpath, []), diff --git a/snippets/post_anamon b/snippets/post_anamon index fc33cfa5..816a0c13 100644 --- a/snippets/post_anamon +++ b/snippets/post_anamon @@ -1,13 +1,13 @@ #if $str($getVar('anamon_enabled','')) == "1" ## install anamon script -wget -O /usr/local/sbin/anamon.py "http://$server/cobbler/aux/anamon.py" +wget -O /usr/local/sbin/anamon "http://$server/cobbler/aux/anamon" ## install anamon system service wget -O /etc/rc.d/init.d/anamon "http://$server/cobbler/aux/anamon.init" ## adjust permissions -chmod 755 /etc/rc.d/init.d/anamon /usr/local/sbin/anamon.py -test -d /selinux && restorecon /etc/rc.d/init.d/anamon /usr/local/sbin/anamon.py +chmod 755 /etc/rc.d/init.d/anamon /usr/local/sbin/anamon +test -d /selinux && restorecon /etc/rc.d/init.d/anamon /usr/local/sbin/anamon ## enable the script chkconfig --add anamon diff --git a/snippets/pre_anamon b/snippets/pre_anamon index 636dc1bf..5d38bda2 100644 --- a/snippets/pre_anamon +++ b/snippets/pre_anamon @@ -1,4 +1,4 @@ #if $str($getVar('anamon_enabled','')) == "1" -wget -O /tmp/anamon.py "http://$server/cobbler/aux/anamon.py" -python /tmp/anamon.py --name "$name" --server "$server" --port "$http_port" +wget -O /tmp/anamon "http://$server/cobbler/aux/anamon" +python /tmp/anamon --name "$name" --server "$server" --port "$http_port" #end if |