diff options
| -rw-r--r-- | rpkid/Makefile.in | 21 | ||||
| -rw-r--r-- | rpkid/portal-gui/Makefile.in (renamed from portal-gui/Makefile.in) | 0 | ||||
| -rw-r--r-- | rpkid/portal-gui/README (renamed from portal-gui/README) | 0 | ||||
| -rw-r--r-- | rpkid/portal-gui/README.apache (renamed from portal-gui/README.apache) | 0 | ||||
| -rw-r--r-- | rpkid/portal-gui/apache/rpki.conf.in (renamed from portal-gui/apache/rpki.conf.in) | 17 | ||||
| -rw-r--r-- | rpkid/portal-gui/apache/rpki.wsgi (renamed from portal-gui/apache/rpki.wsgi) | 0 | ||||
| -rw-r--r-- | rpkid/portal-gui/media/img/my.png (renamed from portal-gui/media/img/my.png) | bin | 10307 -> 10307 bytes | |||
| -rw-r--r-- | rpkid/portal-gui/media/img/rpki.png (renamed from portal-gui/media/img/rpki.png) | bin | 28820 -> 28820 bytes | |||
| -rw-r--r-- | rpkid/portal-gui/templates/base.html (renamed from portal-gui/templates/base.html) | 0 | ||||
| -rw-r--r-- | rpkid/portal-gui/templates/registration/login.html (renamed from portal-gui/templates/registration/login.html) | 0 |
10 files changed, 27 insertions, 11 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 317149fc..b474f606 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -41,12 +41,12 @@ SETUP_PY = \ POW_SO = rpki/POW/_POW.so SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki \ - pubd rootd rpkid rpki/gui/scripts/rpkigui-load-csv rpki/gui/scripts/rpkigui-add-user \ - rpki/gui/scripts/rpkigui-response + pubd rootd rpkid portal-gui/rpkigui-load-csv portal-gui/rpkigui-add-user \ + portal-gui/rpkigui-response -AUX_SCRIPTS = rpki/gui/scripts/rpkigui-list-resources +AUX_SCRIPTS = portal-gui/rpkigui-list-resources -all: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS} ${AUX_SCRIPTS} rpki/gui/settings.py +all: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS} ${AUX_SCRIPTS} rpki/gui/settings.py rpki/gui/app/settings.py ${POW_SO}: ext/POW.c setup.py ${SETUP_PY} build_ext --inplace @@ -186,7 +186,6 @@ COMPILE_PYWRAP = AC_PYTHON_INTERPRETER='${PYWRAP}'; ${COMPILE_COMMON} COMPILE_SETTINGS = \ if test -r $@; then chmod u+w $@; else :; fi; \ AC_DATABASE_PATH='${localstatedir}/rpki/gui.db' \ - AC_TEMPLATE_DIR=${datarootdir}/rpki/gui/templates \ AC_SECRET_KEY='${SECRET_KEY}' \ AC_MYRPKI='${sbindir}/myrpki' \ AC_LOCALSTATEDIR='${localstatedir}' \ @@ -221,18 +220,22 @@ rootd: rootd.py rpkid: rpkid.py ${COMPILE_PYWRAP} -rpki/gui/scripts/rpkigui-list-resources: rpki/gui/scripts/list_resources.py +portal-gui/rpkigui-list-resources: portal-gui/list_resources.py ${COMPILE_PYTHON} -rpki/gui/scripts/rpkigui-load-csv: rpki/gui/scripts/load_csv.py +portal-gui/rpkigui-load-csv: portal-gui/load_csv.py ${COMPILE_PYTHON} -rpki/gui/scripts/rpkigui-add-user: rpki/gui/scripts/adduser.py +portal-gui/rpkigui-add-user: portal-gui/adduser.py ${COMPILE_PYTHON} -rpki/gui/scripts/rpkigui-response: rpki/gui/scripts/rpkigui-response.py +portal-gui/rpkigui-response: portal-gui/scripts/rpkigui-response.py ${COMPILE_PYTHON} rpki/gui/settings.py: ${srcdir}/rpki/gui/settings.py.in rm -f $@ ${COMPILE_SETTINGS} + +rpki/gui/app/settings.py: ${srcdir}/rpki/gui/app/settings.py.in + rm -f $@ + ${COMPILE_SETTINGS} diff --git a/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index c5b45b21..c5b45b21 100644 --- a/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in diff --git a/portal-gui/README b/rpkid/portal-gui/README index f3f1ebcd..f3f1ebcd 100644 --- a/portal-gui/README +++ b/rpkid/portal-gui/README diff --git a/portal-gui/README.apache b/rpkid/portal-gui/README.apache index 2955061a..2955061a 100644 --- a/portal-gui/README.apache +++ b/rpkid/portal-gui/README.apache diff --git a/portal-gui/apache/rpki.conf.in b/rpkid/portal-gui/apache/rpki.conf.in index 7d5664fb..3dc2974f 100644 --- a/portal-gui/apache/rpki.conf.in +++ b/rpkid/portal-gui/apache/rpki.conf.in @@ -1,6 +1,18 @@ -# sample apache configuration file for using the portal-gui with mod_wsgi +# $Id$ +# +# Sample apache configuration file for using the portal-gui with +# mod_wsgi -# defines the url to the portal-gui +# +# Configure the WSGI application to run as a separate process from the +# Apache daemon itself. +# +#WSGIDaemonProcess rpki processes=2 +#WSGIProcessGroup rpki + +# +# Defines the URL to the portal-gui +# WSGIScriptAlias / @INSTDIR@/apache/rpki.wsgi <Directory @INSTDIR@/rpkigui> Order deny,allow @@ -14,3 +26,4 @@ Order allow,deny Allow from all </Directory> +# vim:ft=apache diff --git a/portal-gui/apache/rpki.wsgi b/rpkid/portal-gui/apache/rpki.wsgi index 0a7797a7..0a7797a7 100644 --- a/portal-gui/apache/rpki.wsgi +++ b/rpkid/portal-gui/apache/rpki.wsgi diff --git a/portal-gui/media/img/my.png b/rpkid/portal-gui/media/img/my.png Binary files differindex c4d1378e..c4d1378e 100644 --- a/portal-gui/media/img/my.png +++ b/rpkid/portal-gui/media/img/my.png diff --git a/portal-gui/media/img/rpki.png b/rpkid/portal-gui/media/img/rpki.png Binary files differindex 31351980..31351980 100644 --- a/portal-gui/media/img/rpki.png +++ b/rpkid/portal-gui/media/img/rpki.png diff --git a/portal-gui/templates/base.html b/rpkid/portal-gui/templates/base.html index a096cdca..a096cdca 100644 --- a/portal-gui/templates/base.html +++ b/rpkid/portal-gui/templates/base.html diff --git a/portal-gui/templates/registration/login.html b/rpkid/portal-gui/templates/registration/login.html index 86b5392a..86b5392a 100644 --- a/portal-gui/templates/registration/login.html +++ b/rpkid/portal-gui/templates/registration/login.html |
