summaryrefslogtreecommitdiffstats
path: root/website
diff options
context:
space:
mode:
Diffstat (limited to 'website')
-rw-r--r--website/certs.asc37
-rw-r--r--website/medlemskap.mdwn15
-rw-r--r--website/om.mdwn2
3 files changed, 33 insertions, 21 deletions
diff --git a/website/certs.asc b/website/certs.asc
index d47a9bb..9b68ccd 100644
--- a/website/certs.asc
+++ b/website/certs.asc
@@ -65,7 +65,7 @@ fripost.org:443, www.fripost.org:443 (website), wiki.fripost.org:443 (wiki)
SPKI:
SHA1 B8:CB:E1:30:7E:BA:03:C3:DB:BE:BF:65:FD:80:68:F8:D3:E0:1C:7D
SHA256 fQ+gau72iwOf6rmXvY7/QemB+kYhixPCY/A/EIr3ats=
- Backup pubkey:
+ Backup SPKI:
SHA256 MYhOgCyUOp8NRGxa1LZc57g0wREA3kV8C+4SsrDajt8=
mail.fripost.org:443, webmail.fripost.org:443 (webmail)
@@ -74,7 +74,7 @@ mail.fripost.org:443, webmail.fripost.org:443 (webmail)
SPKI:
SHA1 4F:E7:42:40:98:35:51:CF:93:65:EF:F2:D1:7C:3C:46:60:64:2C:30
SHA256 SHfniMEapxeYo5YT/2jP+n+WstNaYghDMhZUadLlPDk=
- Backup pubkey:
+ Backup SPKI:
SHA256 /Tt92H3ZkfEW1/AOCoGVm1TxZl7u4c+tIBnuvAc7d5w=
lists.fripost.org:443 (list manager)
@@ -83,7 +83,7 @@ lists.fripost.org:443 (list manager)
SPKI:
SHA1 E9:45:89:19:95:44:B1:C7:61:C1:75:4B:A1:3F:8C:38:D4:10:A5:33
SHA256 OLx1hOEqnCdS/7ZgzTzAl8Ig/Cwpz5MY9J9Fishg6/0=
- Backup pubkey:
+ Backup SPKI:
SHA256 v/Ow0Ou2m08HO10wxci1IVrMC/pbihnoDNxvUwKBsMY=
git.fripost.org:443 (git server and its web interface)
@@ -92,7 +92,7 @@ git.fripost.org:443 (git server and its web interface)
SPKI:
SHA1 02:D7:7C:F0:16:F4:55:0D:C3:6B:A1:C4:B6:95:1B:65:26:64:C8:28
SHA256 HOoiXgC7tolzZ31b65UzbAKhpCCA7I0iNdO7NEuL0lU=
- Backup pubkey:
+ Backup SPKI:
SHA256 7F+6dSG3D3X3SSLXmb4GWWqUViztamLmmCBlYCi4a10=
SSH server
@@ -104,19 +104,18 @@ gitolite@git.fripost.org:22
SHA256 zNZXfa/okPm/tV9dl3gNlizfXAghrMSgrcwICiWx+80
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCgAGBQJXhWXTAAoJENOaSZw8IaVStnMP/0V/yQuKUnH8N6KPkfwlu4Sq
-5ggFe6h9wmB9fLEVbV8CaIGtDLjpM7UjGx8WCv1Qr87hd1mke4IkF16gUGQ2Auw7
-86ZsBPV5VmB8f1nbuROrs50yXnOqobZicx1Fe9RPbbNrxk5jeZy+du5d0eD4tXpl
-v5+3gwl1Q7mtGpyStSGp5rLDbaP9xhyXo/VgnSIeU1mpnRk/sJyN5u7VTafAA0pp
-dZKYREtd9zr2YsmY9cQmuZH9Dz3/pvMQxOiaHyU3PyAEI+PQbEievtsVIoyJfBbX
-mYkyTlnIxK95LMlVZ7fII8vBLAyVDMp4bMNK5OtGvsj1zvoGhFUBZrQ9JAtjxKGE
-0R0PNON1Hfyjoti5/BNFhtUBpiKoQq5lun4EcugMz0JhubzYa+LfVPDL9f4QOU+o
-InG2RQymo/KMA8Z+VvDSDySbJJ2pPkQlBgTbSJadUeNufcRhWtnNSIMGv+xDm9aq
-8Ivj0aG2xqhIfHf5suNDQR+xJxS300N6rPyWbW5LOq9ynKDR6hEBIHrmuHqmfv2g
-cIKGT9ODo1GIfm1s2oVIsk+c9EjultDhpU1dfwELBQzZd32i/GkDu1AMlHJS2r+O
-Ix2ipS1n2rCpZAyHT5WLZVARopXqa2sIE9GsTzAMkFqnbCAyljjGpGliQ7THVP2G
-yi/c/Dpip3XBOV/0AxoY
-=HvBp
+
+iQIzBAEBCgAdFiEERpy6p3b9sfzUdbME05pJnDwhpVIFAlksNzUACgkQ05pJnDwh
+pVK/6A//fmJdhemJdHF8Amk1tpqDO9GiFPSU0DkCj4tB1eWWnxr/cFWgHDDXUUEl
+bqqLBoJkBfshHH3c2JUsUEtPkFok3kVy9rKu1lHansQUCDrbFfQqq62zaWVHRjcZ
+TYMgr1PhEjbA9TRC/7LPRf9vQFolsN5fQAvVIvthr6I4uomuucffOq8PcKv36Gq4
+7p0R6lIcJdzUyQlqObA/nwP8HzA8NIdvwgfR616HMfOJSTzRhwY3WbTjSDH+zU67
+iRH7OJq85elklTQQPkp77hYZp0kOFH42IKZsRoQ5Nx8HCpjQ3S6bYrSoyMh6vWCi
+wJRK52dSOiXPd4XSF7+D/yUPhlw9GcenmkEw9/HyJ76KAmmDCPL1SwcAQ1sudVA+
+x2piJL8UrIcDZjT0J6qcnNMZI/HorNb2FcxddFZMdy0ebPHSntwcCrGUniYgU2uJ
+0BztyB5rd7omqtgbWCi2S86Ghyf3XwEx5sPFfhq5jeLaDguQnOwKFgmMOUYEHEwy
+NnZN7i9fyFVkd2ReYPS59CYCS9cvqRRaq5xGvg2fKYU0cK4RTWLZvRYY0XmLjR4j
+UQuwo3FkK55u1vsx4cP9vNhXKbADxW8crzYyBqAqc7rOb/LG2pFLYQL/pb8OID24
+9znHd5fBm9cEX3nIiXq21jhLFoXnBYBr5xqOWyqU23uxT8szeyI=
+=gPC6
-----END PGP SIGNATURE-----
diff --git a/website/medlemskap.mdwn b/website/medlemskap.mdwn
index a0a077a..4d0cfd5 100644
--- a/website/medlemskap.mdwn
+++ b/website/medlemskap.mdwn
@@ -45,6 +45,21 @@ känner sig manade betalar 500 kr för medlemskap och donation. Betala genom ban
kontant, eller genom nedanstående PayPal-knapp. Notera i meddelandefältet att
inbetalningen också gäller donnation.
+\
+ <div align="middle">
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="9Q5MVLK8X8QDG">
+ <input type="image" src="/static/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+ </form>
+ </div>
+
+
+Vid betalning från utlandet är det följande uppgifter som gäller:
+
+ * IBAN: SE27 9500 0099 6026 0477 8841
+ * BIC: NDEASESS
+
Vad innebär medlemskapet?
-------------------------
diff --git a/website/om.mdwn b/website/om.mdwn
index ee33131..78d90ef 100644
--- a/website/om.mdwn
+++ b/website/om.mdwn
@@ -97,5 +97,3 @@ Vår [hemsida](https://fripost.org) och
Se [medlemssidan](/medlemskap) för mer information om hur du kan gå
med i Fripost.
-
-