diff --git a/Makefile b/Makefile index 383144c..80620c9 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,10 @@ OUTPUTDIR=$(BASEDIR)/output CONFFILE=$(BASEDIR)/pelicanconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py -SSH_HOST=2025.fossy.us +SSH_HOST=140.211.166.3 SSH_PORT=22 SSH_USER=debian -SSH_TARGET_DIR=/var/www/2025.fossy.us/ - +SSH_TARGET_DIR=/var/www/fossy-placeholder DEBUG ?= 0 ifeq ($(DEBUG), 1) diff --git a/bin/deploy b/bin/deploy new file mode 100755 index 0000000..b1bfb00 --- /dev/null +++ b/bin/deploy @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e # Abort on failure + +git push +make publish +make rsync_upload diff --git a/deploy/nginx.conf b/deploy/nginx.conf index 4a883a0..0e83d1c 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -1,15 +1,15 @@ server { listen 80; - server_name 2025.fossy.us; - root /var/www/2025.fossy.us; + server_name 2026.fossy.us; + root /var/www/2026.fossy.us; index index.html; } server { listen 443 ssl http2; - server_name 2025.fossy.us; - root /var/www/2025.fossy.us; + server_name 2026.fossy.us; + root /var/www/2026.fossy.us; index index.html; - ssl_certificate /etc/letsencrypt/live/2025.fossy.us/fullchain.pem - ssl_certificate_key /etc/letsencrypt/live/2025.fossy.us/privkey.pem + ssl_certificate /etc/letsencrypt/live/2026.fossy.us/fullchain.pem + ssl_certificate_key /etc/letsencrypt/live/2026.fossy.us/privkey.pem } \ No newline at end of file diff --git a/pelicanconf.py b/pelicanconf.py index 3acaf44..f5bd401 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -1,7 +1,7 @@ AUTHOR = 'Software Freedom Conservancy' -SITENAME = 'FOSSY 2025' -SITESUBTITLE = 'July 31st – August 3rd 2025 — Portland State University, OR' -SITEURL = '2025.fossy.us' +SITENAME = 'FOSSY 2026' +SITESUBTITLE = 'July 31st – August 3rd 2026 — Portland State University, OR' +SITEURL = '2026.fossy.us' PATH = 'content' diff --git a/themes/fossy/templates/index.html b/themes/fossy/templates/index.html index 5cdfd10..c2e8b0f 100644 --- a/themes/fossy/templates/index.html +++ b/themes/fossy/templates/index.html @@ -9,7 +9,7 @@

Software Freedom Conservancy will again hosting a community oriented conference this coming summer. FOSSY (Free and Open Source Software Yearly) is focused on the creation and impact of free and open source software, uplifting contributors of all experience.

We will have community-led tracks with talks over four days. The call for tracks is currently open! Previous tracks included community building, education, development and legal and licensing issues, our conference will provide ample learning and networking opportunities for contributors of all levels of experience. There will be hands on workshops, lightning talks and traditional 50 minute talks.

As we look to the future of conferences, we are excited to focus on using free software to run a conference and will seek to help reduce the amount of proprietary software that is treated as default.

-

If you are interested in sponsoring our conference, please see our Sponsorship Prospectus or contact us at conference@sfconservancy.org.

+

If you are interested in sponsoring our conference, please see our Sponsorship Prospectus or contact us at conference@sfconservancy.org.

Talks from last year's FOSSY are available here.