diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-03-14 21:21:38 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-03-14 21:21:38 +0000 |
| commit | 98c7b0f51824d34fe51d889f90f6dbe1c802ea3d (patch) | |
| tree | 6cf65490c1ecbda46e9d2f6c85fb0f9b1e4c7387 /rpkid | |
| parent | 418e9a4ae2b7b929b1e5ed2ca2e67849f0ec1e9f (diff) | |
add alias for /rcynic/ to the generated apache.conf (see #465)
svn path=/trunk/; revision=5148
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 4 | ||||
| -rw-r--r-- | rpkid/portal-gui/apache.conf.in | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 115fdadd..396ef171 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -20,6 +20,7 @@ INSTALL = @INSTALL@ WSGI_DAEMON_PROCESS=@WSGI_DAEMON_PROCESS@ WSGI_PROCESS_GROUP=@WSGI_PROCESS_GROUP@ GUI_INSTALL_TARGETS=@GUI_INSTALL_TARGETS@ +RCYNIC_HTML_DIR=@RCYNIC_HTML_DIR@ INSTDIR=${DESTDIR}$(datarootdir)/rpki SYSCONFDIR=${DESTDIR}${sysconfdir}/rpki @@ -39,7 +40,8 @@ distclean: clean edit = sed \ -e 's|@INSTDIR[@]|$(INSTDIR)|g' \ -e 's|@WSGI_DAEMON_PROCESS[@]|$(WSGI_DAEMON_PROCESS)|' \ - -e 's|@WSGI_PROCESS_GROUP[@]|$(WSGI_PROCESS_GROUP)|' + -e 's|@WSGI_PROCESS_GROUP[@]|$(WSGI_PROCESS_GROUP)|' \ + -e 's|@RCYNIC_HTML_DIR[@]|$(RCYNIC_HTML_DIR)|' apache.conf: $(srcdir)/apache.conf.in Makefile $(edit) $@.in > $@ diff --git a/rpkid/portal-gui/apache.conf.in b/rpkid/portal-gui/apache.conf.in index cc53f7e4..082e49df 100644 --- a/rpkid/portal-gui/apache.conf.in +++ b/rpkid/portal-gui/apache.conf.in @@ -28,6 +28,13 @@ Allow from all Alias /media/ @INSTDIR@/media/ Alias /site_media/ @INSTDIR@/media/ +<Directory @RCYNIC_HTML_DIR@> +Order deny,allow +Allow from all +</Directory> +Alias /rcynic/ @RCYNIC_HTML_DIR@/ + + # redirect to the dashboard when someone hits the bare vhost RedirectMatch ^/$ /rpki/ |