Commit 555fb194 authored by Evilham's avatar Evilham

Remove legacy os/packages files and code.

Also updated nginx sample config and removed other webservers.
parent df2dc4ba
This diff is collapsed.
......@@ -28,13 +28,6 @@ page "/os/*", :layout => :os
# :which_fake_page => "Rendering a fake page with a local variable" }
# Don't use this for old URLs: see etc/
#activate :devuan_packages
data.devuan.packages.each do |pkg|
proxy "/os/packages/#{pkg.name}.html", "os/packages/package.html",
:locals => { :pkg => pkg }, :ignore => true
end
###
# Variables (DO NOT CHANGE)
###
......
#
# beta.devuan.org
#
# Production version
#
<VirtualHost *:80>
ServerName beta.devuan.org
Redirect / https://beta.devuan.org
</VirtualHost>
<VirtualHost *:443>
ServerName beta.devuan.org
ServerAdmin webmaster@devuan.org
DocumentRoot /srv/www/beta.devuan.org
DirectoryIndex index.html
ErrorDocument 404 /_error/404.html
ErrorDocument 403 /_error/403.html
ErrorDocument 500 502 503 /_error/50x.html
# TODO Add TLS configuration
<Location />
Options +Indexes +MultiViews
AllowOverride None
</Location>
</VirtualHost>
#
# devuan.org
#
# Development version
#
# Add a fake domain for development:
# echo '127.0.0.1 devuan.invalid' | sudo tee -a /etc/hosts
# Run middleman locally:
# gem install middleman
# middleman server -p 4569
#
upstream devuan_org {
server 127.0.0.1:4569;
}
server {
listen 127.0.0.1:80;
server_name devuan.invalid;
root /srv/www/devuan.invalid/public;
index index.html;
# Old URLs
rewrite ^/communicate.*$ /os/debian-fork permanent;
rewrite ^/donate.*$ /os/donate permanent;
rewrite ^/files/devuan.mp3
/os/download/media/devuan.mp3 permanent;
rewrite ^/files/devuan.wav
/os/download/media/devuan.wav permanent;
rewrite ^/(Devuan_budget|devuan_financial_report_2014).pdf
/os/download/report/devuan_budget_2014.pdf permanent;
rewrite ^/devuan_financial_report_2015.pdf
/os/download/report/devuan_financial_report_2015.pdf permanent;
rewrite ^/newsletter_22dec.html
/os/debian-fork/newsletter-12014-12-22 permanent;
rewrite ^/pub.key /os/keyring/repository@devuan.org.asc permanent;
# Old dismissed locations
# Mirror: comment out if that interferes with your site.
location ^/(css|img|js) { return 404; }
# Is this still needed?
location = /google1b5b85f34f8aa7f8.html {
echo "google-site-verification: google1b5b85f34f8aa7f8.html";
}
# Virtual /my Devuan
location /my {
set $gdo https://git.devuan.org;
set $tdo https://talk.devuan.org;
rewrite ^/my/dashboard $gdo/dashboard redirect;
rewrite ^/my/milestones $gdo/dashboard/milestones redirect;
rewrite ^/my/todo.* $gdo/dashboard/todos?state=pending redirect;
rewrite ^/my/activity $tdo/my/activity redirect;
rewrite ^/my/bookmarks $tdo/my/activity/bookmarks redirect;
rewrite ^/my/messages $tdo/my/messages redirect;
rewrite ^/my/preferences $tdo/my/preferences redirect;
rewrite ^/my/profile $tdo/my/profile redirect;
return 403;
}
location ~ ^(/os/releases) {
rewrite ^/os/releases/stable $1/jessie last;
rewrite ^/os/releases/testing $1/ascii last;
rewrite ^/os/releases/unstable $1/ceres last;
}
# Localize error pages
# Defaults to English
# MIRROR: change /en for your locale!
error_page 403 /en/error/403.html;
error_page 404 /en/error/404.html;
error_page 501 502 503 /en/error/50x.html;
location ~ ^/(de|en|es|fr|it) {
try_files $uri $uri.html $uri/ @backend;
error_page 403 /$1/error/403.html;
error_page 404 /$1/error/404.html;
error_page 501 502 503 /$1/error/50x.html;
}
location / {
try_files $uri $uri.html $uri/ @backend;
error_page 403 /en/error/403.html;
error_page 404 /en/error/404.html;
error_page 501 502 503 /en/error/50x.html;
}
# Links are made like this: /:locale/path
# But English is the default language, so we skip /en
# MIRROR: you may want to switch to your language instead!
rewrite ^/en/(.*)$ /$1 last;
# rewrite ^/fr/(.*)$ /$1 last; # French mirror example
location @backend {
return 404; # Comment this if you want to run middleman locally
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_intercept_errors off;
proxy_pass http://devuan_org;
}
}
#
## devuan.org
#
# Configuration for Jessie beta
#
server {
listen :80;
listen :443;
server_name devuan.org www.devuan.org;
rewrite ^ https://beta.devuan.org$uri redirect;
}
# This is the main configuration for devuan.org
# It's included in /etc/nginx/sites-available/devuan.org.conf
# Old URLs
rewrite ^/communicate.*$ /os/debian-fork permanent;
# rewrite ^/releases.*$ https://files.devuan.org permanent;
rewrite ^/os/releases/.*$ /os/releases permanent;
# rewrite ^/os/releases/jessie.*$ https://files.devuan.org permanent;
rewrite ^/donate.*$ /os/donate permanent;
rewrite ^/files/devuan.mp3
/os/download/media/devuan.mp3 permanent;
rewrite ^/files/devuan.wav
/os/download/media/devuan.wav permanent;
rewrite ^/(Devuan_budget|devuan_financial_report_2014).pdf
/os/download/report/devuan_budget_2014.pdf permanent;
rewrite ^/devuan_financial_report_2015.pdf
/os/download/report/devuan_financial_report_2015.pdf permanent;
rewrite ^/newsletter_22dec.html
/os/debian-fork/newsletter-12014-12-22 permanent;
rewrite ^/pub.key /os/download/devuan-release-key.pub permanent;
# Virtual /my Devuan
location /my {
set $gdo https://git.devuan.org;
rewrite ^/my/dashboard $gdo/dashboard redirect;
rewrite ^/my/milestones $gdo/dashboard/milestones redirect;
rewrite ^/my/todo.* $gdo/dashboard/todos?state=pending redirect;
set $tdo https://talk.devuan.org;
rewrite ^/my/activity $tdo/my/activity redirect;
rewrite ^/my/bookmarks $tdo/my/activity/bookmarks redirect;
rewrite ^/my/messages $tdo/my/messages redirect;
rewrite ^/my/preferences $tdo/my/preferences redirect;
}
# Robots
location = /robots.txt {
echo "User-agent: Twitterbot";
echo "Disallow:";
echo "";
echo "User-agent: *";
echo "Disallow: /index.html?";
echo "Disallow: /?";
echo "Disallow: /my";
echo "Disallow: /os/download";
echo "Allow: /os/download/media/devuan.mp3";
echo "Allow: /os/download/media/devuan.wav";
echo "Allow: /os/download/media/devuan_press_kit.zip";
echo "Allow: /os/download/report/devuan_financial_report_2014.pdf";
echo "Allow: /os/download/report/devuan_financial_report_2015.pdf";
echo "Allow: /os/download/devuan_jessie_1.0.0_beta.torrent";
echo "Allow: /os/download/devuan-trademark.pdf";
echo "Disallow: /ui";
echo "Allow: /ui/img/devuan-emblem.png";
echo "Allow: /ui/img/devuan-emblem.svg";
echo "Allow: /ui/img/devuan-logo.png";
echo "Allow: /ui/img/devuan-logo-with-registered-trademark-sign.svg";
echo "Sitemap: /os/sitemap.xml";
}
# Cache assets
location ~* ^/ui/(css|img) {
try_files $uri.gz $uri =404;
expires +1y;
}
# Download (fixes #125)
location ~ ^/os/download {
try_files $uri @files;
}
# TODO: Lookup /etc for matching file and redirect to /os/etc/...
# location @fs {}
location @files {
return 302 https://files.devuan.org/?ref=$uri;
access_log /var/log/nginx/devuan.org_download_redirects.log;
}
#
# beta.devuan.org
#
# Production version
#
server {
listen *:80;
server_name beta.devuan.org;
location ~ ^/.well-known/acme-challenge {
root /srv/letsencrypt;
}
rewrite ^ https://$server_name$uri permanent;
}
server {
listen *:443 ssl;
server_name beta.devuan.org;
# Mirror example:
# server_name beta.devuan.org fr.devuan.org devuan.fr;
root /srv/beta.devuan.org/public;
# Old URLs
rewrite ^/communicate.*$ /os/debian-fork permanent;
rewrite ^/donate.*$ /os/donate permanent;
rewrite ^/files/devuan.mp3
/os/download/media/devuan.mp3 permanent;
rewrite ^/files/devuan.wav
/os/download/media/devuan.wav permanent;
rewrite ^/(Devuan_budget|devuan_financial_report_2014).pdf
/os/download/report/devuan_budget_2014.pdf permanent;
rewrite ^/devuan_financial_report_2015.pdf
/os/download/report/devuan_financial_report_2015.pdf permanent;
rewrite ^/newsletter_22dec.html
/os/debian-fork/newsletter-12014-12-22 permanent;
rewrite ^/pub.key /os/keyring/repository@devuan.org.asc;
# Old dismissed locations
# Mirror: comment out if that interferes with your site.
location ^/(css|img|js) { return 404; }
# Moved sitemap up because of conflicting layout
rewrite ^/os/sitemap.xml /sitemap.xml permanent;
# Is this still needed?
location = /google1b5b85f34f8aa7f8.html {
echo "google-site-verification: google1b5b85f34f8aa7f8.html";
}
# Virtual /my Devuan
location /my {
set $gdo https://git.devuan.org;
set $tdo https://talk.devuan.org;
rewrite ^/my/dashboard $gdo/dashboard redirect;
rewrite ^/my/milestones $gdo/dashboard/milestones redirect;
rewrite ^/my/todo.* $gdo/dashboard/todos?state=pending redirect;
rewrite ^/my/activity $tdo/my/activity redirect;
rewrite ^/my/bookmarks $tdo/my/activity/bookmarks redirect;
rewrite ^/my/messages $tdo/my/messages redirect;
rewrite ^/my/preferences $tdo/my/preferences redirect;
rewrite ^/my/profile $tdo/my/profile redirect;
return 403;
}
# Localize error pages, English default
error_page 403 /en/error/403.html;
error_page 404 /en/error/404.html;
error_page 500 502 503 /en/error/50x.html;
location /en/error {
internal;
}
location ~ ^/(de|en|es|fr|it) {
try_files $uri $uri.html $uri/ =404;
error_page 403 /$1/error/403.html;
error_page 404 /$1/error/404.html;
error_page 501 502 503 /$1/error/50x.html;
}
# Links are made like this: /:locale/path
# But English is the default language so we skip /en
# MIRROR: you may want to switch to your language instead!
rewrite ^/en/(.*)$ /$1 last;
# rewrite ^/fr/(.*)$ /$1 last; # French mirror example
# Add TLS configuration
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0
ssl_prefer_server_ciphers on;
ssl_session_cache builtin:1000 shared:SSL:10m;
# ssl_session_tickets off; # Requires nginx >= 1.5.9
# ssl_stapling on; # Requires nginx >= 1.3.7
# ssl_stapling_verify on; # Requires nginx => 1.3.7
# Add your DNS resolvers and adjust timeout (default is 5s)
resolver 8.8.8.8 valid=300s;
resolver_timeout 3s;
ssl_certificate /srv/beta.devuan.org/etc/ssl/beta.crt.pem;
ssl_certificate_key /srv/beta.devuan.org/etc/ssl/beta.key.pem;
add_header X-Frame-Options "ALLOW-FROM https://talk.devuan.org";
add_header Access-Control-Allow-Origin https://beta.devuan.org,https://talk.devuan.org,https://git.devuan.org,https://devuan.org;
add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
add_header X-Content-Security-Policy "default-src 'self'; script-src 'self'; img-src 'self'";
add_header X-Content-Type-Options nosniff;
location / {
try_files $uri $uri.html $uri/ =404;
}
access_log /var/log/nginx/beta.devuan.org_access.log;
error_log /var/log/nginx/beta.devuan.org_error.log;
}
#
# Basic nginx config.
# TLS support, redirects, are missing here.
#
server {
listen 80;
server_name devuanzuwu3xoqwp.onion;
root /var/www/devuan-www/public.current;
include /etc/nginx/snippets/devuan-web.conf;
}
server {
listen 80;
server_name devuan.org www.devuan.org;
root /var/www/devuan-www;
include /etc/nginx/snippets/devuan-web.conf;
}
#
# BEGIN Old config
# TODO: Check if this is still valid
#
# This is the main configuration for devuan.org
# It's included in /etc/nginx/sites-available/devuan.org.conf
# Old URLs
rewrite ^/communicate.*$ /os/debian-fork permanent;
# rewrite ^/releases.*$ https://files.devuan.org permanent;
rewrite ^/os/releases/.*$ /os/releases permanent;
rewrite ^/os/mirror.*$ /#download permanent;
# https://files.devuan.org permanent;
# rewrite ^/os/releases/jessie.*$ https://files.devuan.org permanent;
rewrite ^/donate.*$ /os/donate permanent;
rewrite ^/files/devuan.mp3
/os/download/media/devuan.mp3 permanent;
rewrite ^/files/devuan.wav
/os/download/media/devuan.wav permanent;
rewrite ^/(Devuan_budget|devuan_financial_report_2014).pdf
/os/download/report/devuan_budget_2014.pdf permanent;
rewrite ^/devuan_financial_report_2015.pdf
/os/download/report/devuan_financial_report_2015.pdf permanent;
rewrite ^/newsletter_22dec.html
/os/debian-fork/newsletter-12014-12-22 permanent;
#
# END Old config
#
# Update this each year to "current" d1conf announcement page.
location ~ ^/d1conf(|/)$ {
return 307 $scheme://$server_name/os/debian-fork/d1conf-announce-20190119;
}
# Redirect legacy package listing to pkginfo.devuan.org
location ~ /os/packages/(.*) {
return 301 https://pkginfo.devuan.org/cgi-bin/d1pkgweb-query?search=$1;
}
# Mirror: change 'en' with your language
# Localize error pages, English default
error_page 403 /error/403.html;
error_page 404 /error/404.html;
error_page 500 501 502 503 /error/50x.html;
location /error {
internal;
}
# Links are made like this: /:locale/path
# But English is the default language so we skip /en
# Mirror: switch to your language instead!
# rewrite ^/fr/(.*)$ /$1 last; # French mirror example
rewrite ^/en/(.*)$ /$1 last; # Mirror: comment out if you mirror a translation
location / {
autoindex off;
try_files $uri $uri/index.html $uri.htm $uri.html =404;
}
......@@ -118,12 +118,6 @@ module DevuanHelpers
end || "unknown license: #{l}"
end
def package
# name = current_page.path.split('/').pop.sub!('/(index)?\.html/', '').to_s
# require(__DIR__ + '/plugins/devuan_packages/lib/devuan_packages.rb')
# devuan_packages(name)
end
def pkg_classification(pkg)
c = [pkg.origin, pkg.section, pkg.priority, (t(:essential) if pkg.essential == 'yes')]
content_tag('p', c.compact.join(' : '), class: 'classification')
......
---
title: "Devuan Package Search"
---
# Search Devuan Packages
## Devuan's New Package Search Function:
## [https://pkginfo.devuan.org](https://pkginfo.devuan.org)
## Forked and Original Devuan Packages:
## [https://git.devuan.org/groups/devuan-packages](https://git.devuan.org/groups/devuan-packages)
## If you can’t find a package, check the list of banned packages:
## [https://pkgmaster.devuan.org/bannedpackages.txt](https://pkgmaster.devuan.org/bannedpackages.txt)
<!-- title <%= pkg.name %> body <%= partial 'devuan_package', :locals => { pkg: pkg, summary: false } %> -->
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment