huang_h/WebHosting
0
0
Fork 0
forked from linux/WebHosting
Code Pull Requests Activity
404 Commits 2 Branches 0 Tags
main
Commit Graph
404 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bruhn_b 326cd79289 Merge pull request 'slsbl' (#88) from flechsig/WebHosting:main into main 
Reviewed-on: linux/WebHosting#88
 2026-09-10 13:47:20 +02:00
flechsig 8e33ab2832 add slsbl project 2026-09-10 11:21:30 +02:00
flechsig 9b37490b1a merge upstream 2026-09-10 11:10:52 +02:00
bruhn_b 67e6df6ec7 update lib and class for prod 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-04 10:29:30 +02:00
bruhn_b d2e76d90b5 edit lib path for docrouter 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-04 10:07:23 +02:00
bruhn_b 6f7533a76b edit classpath 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-04 09:49:03 +02:00
bruhn_b b9cc92d210 access for lmx elog 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-01 08:43:03 +02:00
flechsig 47ffbf001b new image version 1.8 (#86) 
Reviewed-on: linux/WebHosting#86
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
Co-authored-by: flechsig <uwe.flechsig@psi.ch>
 2026-08-27 10:51:22 +02:00
flechsig 5e0b89c176 new image version 1.8 2026-08-26 15:16:55 +02:00
bruhn_b c870b8234c update nginx log format 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-25 15:15:34 +02:00
bruhn_b d79815c100 remove high energy physics apps from test since they are all in DMZ 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-24 18:33:24 +02:00
bruhn_b 000f35ae86 Merge pull request 'MCDA SRF update' (#81) from huang_h/WebHosting:main into main 
Reviewed-on: linux/WebHosting#81
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
 2026-08-24 16:45:39 +02:00
River 30185a583c Tiermaker email function update 2026-08-24 14:17:50 +02:00
huang_h c3fe1f479f merge upstream 2026-08-24 14:10:55 +02:00
altorf_aandAimo Altorfer 94d11e34ce add pikettlischte-beautifier for pikett.psi.ch (#85) 
Co-authored-by: Aimo Altorfer <hansoberdorf41@gmail.com>
Reviewed-on: linux/WebHosting#85
Co-authored-by: altorf_a <aimo.altorfer@psi.ch>
 2026-08-19 10:28:19 +02:00
bruhn_b 0c2d51b85b Merge pull request 'move pct from docker to docker-dmz' (#84) from pct into main 
Reviewed-on: linux/WebHosting#84
 2026-08-13 10:53:40 +02:00
bruhn_b 323139931c move pct from docker to docker-dmz 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-13 10:53:06 +02:00
bruhn_b e999517395 emergency network fix 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-13 10:22:42 +02:00
bruhn_b bf709c943a Merge pull request 'udpate tiermaker compose file' (#83) from tiermaker into main 
Reviewed-on: linux/WebHosting#83
 2026-08-13 10:21:09 +02:00
bruhn_b dd22a66142 update version number 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-13 10:19:24 +02:00
bruhn_b 5d22d4a405 udpate tiermaker compose file 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-13 10:11:54 +02:00
bruhn_b 0836ad83c2 Merge pull request 'scicat-rocrate-dev: config' (#82) from data-catalog-services/WebHosting:scicat-rocrate-dev into main 
Reviewed-on: linux/WebHosting#82
 2026-08-11 14:23:09 +02:00
fpotier 20221d30db scicat-rocrate-dev: config 2026-08-11 14:21:27 +02:00
bruhn_b d9a56f671b file name 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-10 13:51:58 +02:00
bruhn_b a4eee184f5 add tiermaker 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-10 13:48:54 +02:00
River b093aeec76 MCDA SRF update 2026-08-10 12:02:34 +02:00
bruhn_b 464a27d690 archive cost 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-05 18:55:05 +02:00
bruhn_b c988c6e9a7 remove alloy and archive cost 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-05 18:52:17 +02:00
bruhn_b b07e0afd66 enable production exporter 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-21 14:13:17 +02:00
bruhn_b d6bcfda530 banf fetcher in test 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-17 13:54:15 +02:00
ebner b5ded615fa Merge pull request 'Rework Apache vhost for SSL-terminating reverse proxy' (#79) from holler/WebHosting:fix/redirect_issue into main 
Reviewed-on: linux/WebHosting#79
 2026-07-16 09:44:05 +02:00
holler d3f333d3d2 Rework Apache vhost for SSL-terminating reverse proxy 
TLS is terminated at the proxy; Apache receives plain HTTP on :80.
Merge all rules into a single *:80 vhost (the :443 vhost was never
reached) and make the HTTPS redirect conditional on
X-Forwarded-Proto: http. Fixes ERR_TOO_MANY_REDIRECTS.
 2026-07-16 09:21:52 +02:00
bruhn_b 94405196cd fix omny 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-16 08:34:29 +02:00
bruhn_b abaabcd409 Merge pull request 'First version of server config for omny' (#78) from holler/WebHosting:omny-server-config into main 
Reviewed-on: linux/WebHosting#78
 2026-07-14 15:00:49 +02:00
holler c2dc78b958 First version of server config for omny 
Apache vhost for omny-test.psi.ch (migration from lighttpd)
This config replaces the lighttpd setup for the OMNY status page. All authentication is done at the PHP level via rewrite rules — there is no mod_auth usage. Requests to the administrators:

Enable mod_rewrite and mod_ssl. Note: the vhost will fail configtest without mod_rewrite — this is intentional (without the rewrite rules, Apache would serve all files with no authentication, so failing loudly is the safe mode).
Certificate: the SSLCertificateFile / SSLCertificateKeyFile paths are placeholders in Let's Encrypt layout — please adjust to the actual certificate location for omny-test.psi.ch, or let us know how TLS is provisioned on this host.
PHP execution must be active for .php files under /var/www/omny (PHP-FPM, CGI/FastCGI, or mod_php — whichever is standard on this host is fine; the code requires PHP ≥ 7.1, no extensions beyond the defaults).
Please confirm whether any reverse proxy / load balancer sits in front of Apache. Several endpoints (upload.php, session_query.php, set_password.php) authorize by client IP (REMOTE_ADDR); if requests arrive via a proxy, we need to know so we can adapt the whitelist logic.
After deployment: apachectl configtest and reload. A quick functional check is opening https://omny-test.psi.ch/login.php — the login form should render (if PHP source code is shown instead, PHP execution is not wired up; please don't leave it in that state, as the source contains a secret).

The optional HSTS header is present but commented out (would additionally require mod_headers)
 2026-07-14 14:46:46 +02:00
bruhn_b c0fed2147a ne fetching in test either 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-13 17:28:27 +02:00
bruhn_b 2e1b175f1f no fetching 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-13 16:44:55 +02:00
bruhn_b e9f13dda6e make docrouter production ready 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-13 16:39:43 +02:00
bruhn_b 16dbd3968d deploy python container for production data fetcher 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-13 16:28:55 +02:00
bruhn_b baf81b2dc0 Merge pull request 'MCDA SRF update' (#77) from huang_h/WebHosting:main into main 
Reviewed-on: linux/WebHosting#77
 2026-07-13 15:00:42 +02:00
River 016a6ac082 MCDA SRF update 2026-07-11 17:27:02 +02:00
bruhn_b 9afae99349 change SFTP to SCP 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-09 14:25:19 +02:00
bruhn_b 98f43720d1 typo in CMD 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-09 14:21:23 +02:00
bruhn_b 5942d2a7b1 add input dir and script command for container to stay in foreground 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-09 14:19:25 +02:00
bruhn_b e0a7b9251b rename container 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-09 14:03:57 +02:00
bruhn_b 841ba30f73 install python container to fetch archive data for docrouter 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-09 14:00:17 +02:00
bruhn_b 1a276d9992 typo 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-01 14:57:39 +02:00
bruhn_b 27880676e8 Merge pull request 'archive costs app' (#74) from archive_cost into main 
Reviewed-on: linux/WebHosting#74
 2026-07-01 10:11:50 +02:00
bruhn_b 7f20bedf52 certificate name 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-01 10:09:55 +02:00
bruhn_b 401e773839 PR for archive costs app 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-07-01 09:35:46 +02:00