Enhancement #2536

Restore httpd-admin symlink

Added by Davide Principi almost 6 years ago. Updated almost 6 years ago.

Status:CLOSEDStart date:01/02/2014
Priority:NormalDue date:01/02/2014
Assignee:-% Done:

100%

Category:nethserver-httpd-admin
Target version:v6.5-beta3
Resolution: NEEDINFO:No

Description

The last released nethserver-httpd-admin-1.1.0-1, with Upstart supervision exec() httpd.

We must revert the httpd-admin symlink and start it as /usr/sbin/httpd-admin as it helps distinguishing between traditional httpd and httpd-admin instances.


Related issues

Related to NethServer 6 - Feature #2492: Move admin user in LDAP DB CLOSED 12/17/2013 12/19/2013

Associated revisions

Revision ae17553e
Added by Davide Principi almost 6 years ago

*.spec.in: cleanup %preun script. Refs #2536

Revision c088f629
Added by Davide Principi almost 6 years ago

Restore httpd-admin symlink to httpd executable. Refs #2536

History

#1 Updated by Davide Principi almost 6 years ago

  • Due date set to 01/02/2014
  • Status changed from TRIAGED to ON_DEV
  • Assignee set to Davide Principi
  • Start date set to 01/02/2014
  • % Done changed from 20 to 30
  • Estimated time set to 2.00

#2 Updated by Davide Principi almost 6 years ago

  • Status changed from ON_DEV to MODIFIED
  • Assignee deleted (Davide Principi)
  • % Done changed from 30 to 60

#3 Updated by Davide Principi almost 6 years ago

  • Status changed from MODIFIED to ON_QA
  • % Done changed from 60 to 70

In nethserver-testing:
nethserver-lib-1.4.0-3.0gitce8e11f1.ns6.noarch.rpm
nethserver-base-1.5.0-11.0git12b07501.ns6.noarch.rpm
nethserver-directory-1.3.0-12.0git01b2300a.ns6.noarch.rpm
nethserver-nethgui-1.3.0-5.0gitb985d576.ns6.noarch.rpm
nethserver-mail-server-1.5.0-8.0git7757599e.ns6.noarch.rpm
nethserver-samba-1.4.0-3.0git4fc31495.ns6.noarch.rpm
nethserver-ejabberd-1.0.2-3.0git6fec4e8d.ns6.noarch.rpm
nethserver-hylafax-1.0.3-2.0git1b8d9075.ns6.noarch.rpm
nethserver-httpd-admin-1.1.0-9.0git9b2daa63.ns6.noarch.rpm

#4 Updated by Giacomo Sanchietti almost 6 years ago

  • Assignee set to Giacomo Sanchietti

#5 Updated by Giacomo Sanchietti almost 6 years ago

The link is in place:

[root@test ~]# rpm -qlv nethserver-httpd-admin | grep /usr/sbin/httpd-admin
lrwxrwxrwx    1 root    root                        5 Jan 15 12:50 /usr/sbin/httpd-admin -> httpd

But ardad still raise an alert even if httpd-admin is running:

[root@test ~]# ps aux | grep httpd-admin
srvmgr    1486  0.0  2.5 274516 12716 ?        S    16:18   0:00 /usr/sbin/httpd-admin -f /etc/httpd/admin-conf/httpd.conf
srvmgr    1564  0.0  2.4 274260 12256 ?        S    16:19   0:00 /usr/sbin/httpd-admin -f /etc/httpd/admin-conf/httpd.conf
srvmgr    1876  0.0  1.3 173624  6868 ?        S    16:19   0:00 /usr/sbin/httpd-admin -f /etc/httpd/admin-conf/httpd.conf
srvmgr    2410  0.0  2.7 275812 13696 ?        S    16:27   0:00 /usr/sbin/httpd-admin -f /etc/httpd/admin-conf/httpd.conf
root      4422  0.0  0.1 103240   856 pts/1    S+   16:39   0:00 grep httpd-admin
root     16579  0.0  2.0 171400 10308 ?        Ss   15:30   0:00 /usr/sbin/httpd-admin -f /etc/httpd/admin-conf/httpd.conf
srvmgr   32743  0.0  2.5 274772 12612 ?        S    16:18   0:00 /usr/sbin/httpd-admin -f /etc/httpd/admin-conf/httpd.conf

ardad --alerts
...
 - {name: "httpd-admin", code: HTTPD_ALERT, priority: AVERAGE, hot: true}
...

#6 Updated by Giacomo Sanchietti almost 6 years ago

  • Assignee deleted (Giacomo Sanchietti)

Actual ARDAD implementation can't retrieve status of processes with a '-' in the name.
This behavior causes a false alert about httpd-admin process status.
Now httpd-admin is controlled (and automatically respawned) with upstart: we can safely remove the check on httpd-admin process.

New packages in nethserver-testing:
  • ardad-2.9.4-1.ns6.x86_64.rpm

Test case
Execute:

ardad --dump 2>/dev/null | grep admin
ardad --alerts 2>/dev/null | grep admin

Both output must be empty.

#7 Updated by Davide Principi almost 6 years ago

  • Assignee set to Davide Principi

#8 Updated by Davide Principi almost 6 years ago

  • Status changed from ON_QA to VERIFIED
  • Assignee deleted (Davide Principi)
  • % Done changed from 70 to 90

#9 Updated by Davide Principi almost 6 years ago

  • Status changed from VERIFIED to CLOSED
  • % Done changed from 90 to 100

Released in nethserver/6.5/base repository.

Also available in: Atom PDF