Skip to content

Release 2.4.0 for Modern Operating Systems #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
veorlo wants to merge 1 commit into
base: master
Choose a base branch
from
+1,378 −1,768
Open

Release 2.4.0 for Modern Operating Systems #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY conf/globalnoc-public-el7.repo /etc/yum.repos.d/globalnoc-public-el7.repo
RUN yum makecache
RUN yum -y install epel-release

RUN yum -y install perl-Template-Toolkit perl-XML-Parser perl-XML-Simple perl-CGI-Ajax perl-Time-ParseDate perl-Net-Telnet perl-Expect perl-GRNOC-TL1 perl-GRNOC-Config perl-Class-Accessor perl-YAML perl-JSON perl-Log-Log4perl
RUN yum -y install perl-Template-Toolkit perl-XML-Parser perl-XML-Simple perl-CGI perl-Time-ParseDate perl-Net-Telnet perl-Expect perl-GRNOC-TL1 perl-GRNOC-Config perl-Class-Accessor perl-YAML perl-JSON perl-Log-Log4perl
RUN yum -y install perl-GRNOC-WebService perl-GRNOC-WebService-Client perl-Test-Deep perl-Test-Exception perl-Test-Pod perl-Test-Pod-Coverage perl-Devel-Cover perl-Data-Dumper perl-Test-Harness perl-Test-Simple openssh-clients

COPY conf/routerproxy.conf /etc/httpd/conf.d/routerproxy.conf
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ Perl modules need to be installed as well (generally easily done with cpan).
(NOTE: This is now only required for the menu based commands.. if you
don't have it installed, RouterProxy will still work).
* CGI
* CGI::Ajax
* XML::Simple
* Encode
* Expect
Expand Down
14 changes: 5 additions & 9 deletions conf/logging.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
log4perl.logger.GRNOC.RouterProxy = INFO, Screen
log4perl.logger.GRNOC.RouterProxy.Generator = INFO, Screen
log4perl.logger = DEBUG, Screen
log4perl.logger.GRNOC.RouterProxy = INFO, SYSLOG
log4perl.logger.GRNOC.RouterProxy.Generator = INFO, SYSLOG
log4perl.logger = DEBUG, SYSLOG

# Logs against only the most specific category
# Only log one line (prevents duplicate logging)
log4perl.oneMessagePerAppender = 1

log4perl.appender.Screen = Log::Log4perl::Appender::Screen
log4perl.appender.Screen.stderr = 0
log4perl.appender.Screen.layout = Log::Log4perl::Layout::SimpleLayout

log4perl.appender.SYSLOG = Log::Dispatch::Syslog
log4perl.appender.SYSLOG.facility = LOCAL0
log4perl.appender.SYSLOG.layout = PatternLayout
log4perl.appender.SYSLOG.layout.ConversionPattern=[%d] %p %F %L %c - %m%n
log4perl.appender.SYSLOG.layout.ConversionPattern=[%p] %l: %m%n
12 changes: 9 additions & 3 deletions grnoc-routerproxy.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: GRNOC Router Proxy
Name: grnoc-routerproxy
Version: 2.3.2
Version: 2.4.0
Release: %{_buildno}%{?dist}
License: GRNOC
Group: Auth
Expand All @@ -14,7 +14,7 @@ Requires: perl >= 5.8.8
Requires: perl-Template-Toolkit
Requires: perl(XML::Parser)
Requires: perl(XML::Simple)
Requires: perl(CGI::Ajax)
Requires: perl(CGI)
Requires: perl(Time::ParseDate)
Requires: perl(Net::Telnet)
Requires: perl(Expect)
Expand All @@ -26,7 +26,9 @@ Requires: perl(JSON)
Requires: perl(Log::Log4perl)

Provides: perl(GRNOC::RouterProxy)
Provides: perl(GRNOC::RouterProxy::Commands), perl(GRNOC::RouterProxy::Config), perl(GRNOC::RouterProxy::Logger)
Provides: perl(GRNOC::RouterProxy::Commands)
Provides: perl(GRNOC::RouterProxy::Config)
Provides: perl(GRNOC::RouterProxy::Logger)

BuildRequires: tar
AutoReqProv: no
Expand All @@ -47,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
%{__install} conf/routerproxy.yaml %{buildroot}%{_sysconfdir}/grnoc/routerproxy/
%{__install} conf/logging.conf %{buildroot}%{_sysconfdir}/grnoc/routerproxy/

%{__install} -d -p %{buildroot}/var/log/grnoc/routerproxy/

%{__install} -d -p %{buildroot}%{_sysconfdir}/httpd/conf.d/grnoc/
%{__install} conf/routerproxy.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/grnoc/

Expand Down Expand Up @@ -90,9 +94,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(754,apache,apache,-)
%{_datadir}/grnoc/routerproxy/www/index.cgi
%{_datadir}/grnoc/routerproxy/www/routerproxy.js

%defattr(644,root,apache,-)
%config(noreplace) %{_datadir}/grnoc/routerproxy/www/style.css

%{_datadir}/grnoc/routerproxy/templates/index.tt

%attr(755,apache,apache) %dir %{_datadir}/grnoc/routerproxy/.ssh/
%attr(755,apache,apache) %dir /var/log/grnoc/routerproxy/
Loading