Skip to content
This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

Commit

Permalink
About to update Bazar for release
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Hansen committed Sep 7, 2017
1 parent 1a8914a commit 8c4fef1
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 32 deletions.
30 changes: 13 additions & 17 deletions core/p5.webapp/modules/bazar/bazars/apps.hl
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ name:GaiaSoul main repository


/*
* Sephia Five
* Sephia Five.
*/
app:sephia-five-4-8-zeus
app:sephia-five-4-9-zeus
name:Sephia Five
description:A secure webmail client with PGP cryptography, virus protection, spam filter, and ad removal
condition:p5.io.unroll-path.@SEPHIA
Expand All @@ -33,8 +33,6 @@ app:sephia-five-4-8-zeus

You can see a video demonstrating some of its features [here](https://www.youtube.com/watch?v=0F4SVEoD1HE). Sephia Five is Free Software, Open Source, and Gratis for individuals.

**Notice**, this release requires the latest version of Phosphorus Five, which is version 4.8! Make sure you update your P5 core, before you install this module.

Sephia Five is developed and maintained by Thomas Hansen - thomas@gaiasoul.com, the PGP fingerprint for its developer is '5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD'"
price:Free/GPL
local-url:sephia-five
Expand All @@ -46,31 +44,31 @@ Sephia Five is developed and maintained by Thomas Hansen - thomas@gaiasoul.com,


/*
* Sulphur Five
* Sulphur Five.
*/
app:sulphur-five-4-8-zeus
name:Sulphur Five BETA
description:A secure file sharing system.
app:sulphur-five-4-9-zeus
name:Sulphur Five
description:A secure file sharing system, allowing you to share files publicly, protected and private.
condition:p5.io.unroll-path.@SULPHUR
url:"https://github.com/polterguy/sulphur-five/releases/download/v0.9BETA/sulphur-five.zip.pgp"
author-readme:@"Sulphur Five is a secure file sharing system, which is built with your privacy in mind.
author-readme:@"Sulphur Five is a secure file sharing system built with your privacy in mind.

**Notice**, this release requires the latest version of Phosphorus Five, which is version 4.8! Make sure you update your P5 core, before you install this module.
Sulphur Five allows you to share files privately with only yourself, protected which means with any registered user in your system, or publicly which means the world at large.

Sephia Five is developed and maintained by Thomas Hansen - thomas@gaiasoul.com, the PGP fingerprint for its developer is '5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD'"
Sulphur Five is developed and maintained by Thomas Hansen - thomas@gaiasoul.com, the PGP fingerprint for its developer is '5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD'"
price:Free/GPL
local-url:sulphur-five
image:"https://phosphorusfive.files.wordpress.com/2017/08/vault-icon-2.png"
image:"https://phosphorusfive.files.wordpress.com/2017/09/secure-file-sharing.png"
developer-key:5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD





/*
* Peeples
* Peeples.
*/
app:peeples-4-7-zeus
app:peeples-4-9-zeus
name:Peeples
description:A user management module for Phosphorus Five. Allows you to create, edit and delete users.
condition:p5.io.unroll-path.@PEEPLES
Expand All @@ -79,10 +77,8 @@ app:peeples-4-7-zeus

This is the module you need if you want to create additional user accounts in your Phosphorus Five installation.

**Notice**, this release requires the latest version of Phosphorus Five, which is version 4.8! Make sure you update your P5 core, before you install this module.

Peeples is developed and maintained by Thomas Hansen - thomas@gaiasoul.com, the PGP fingerprint for its developer is '5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD'"
price:Free
price:Free/GPL
local-url:peeples
image:"https://phosphorusfive.files.wordpress.com/2017/08/users.png"
developer-key:5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD
35 changes: 35 additions & 0 deletions core/p5.webapp/modules/bazar/bazars/developer-tools.hl
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

/*
* List of available Bazar apps in developer tools Bazar declaration file.
*/





/*
* First the current Bazar name.
*/
name:GaiaSoul X-Tools





/*
* Hyperbuild.
*/
app:hyperbuild-4-9-zeus
name:Hyperbuild
description:Phosphorus' build system, which allows you to create your own distribution of Phosphorus Five
condition:p5.io.unroll-path.@HYPERBUILD
url:"https://github.com/polterguy/sephia-five/releases/download/v4.8BETA/sephia-five.zip.pgp"
author-readme:@"Hyperbuild is the main build system for Phosphorus Five, and allows you to create your own distribution of the system, including cryptographically sign modules and such, with your own PGP key.

Basically, if you want to create your own distribution, and/or modules, this module significantly simplifies that process, by automatically packaging any modules, and creating a distro of your system's current state.

Hyperlambda is developed and maintained by Thomas Hansen - thomas@gaiasoul.com, the PGP fingerprint for its developer is '5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD'"
price:Free/GPL
local-url:hyperbuild
image:"https://phosphorusfive.files.wordpress.com/2017/09/hyperbuild.png"
developer-key:5E11AEF421CDB0A7A9A5C6B4AED9D04F43BE2AAD
17 changes: 14 additions & 3 deletions core/p5.webapp/modules/bazar/configuration/bazars.hl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@

/*
* List of available Bazars.
*
* Notice, you could of course fork Phosphorus Five, and create your own Bazar app declaration file.
* However, if you do, you would probably want to add your PGP key's fingerprint to the "/bazar/configuration/trusted-app-distributors.hl"
*/


Expand All @@ -9,10 +12,18 @@

/*
* Main Phosphorus Five Bazar.
*
* Notice, you could of course fork Phosphorus Five, and create your own Bazar app declaration file.
* However, if you do, you would probably want to add your PGP key's fingerprint to the "/bazar/configuration/trusted-app-distributors.hl"
*/
bazar:"https://api.github.com/repos/polterguy/phosphorusfive/contents/core/p5.webapp/modules/bazar/bazars/apps.hl?ref=master"
Accept:application/vnd.github.v3.raw
User-Agent:Phosphorus-Five





/*
* Phosphorus Five developer tools Bazar.
*/
bazar:"https://api.github.com/repos/polterguy/phosphorusfive/contents/core/p5.webapp/modules/bazar/bazars/developer-tools.hl?ref=master"
Accept:application/vnd.github.v3.raw
User-Agent:Phosphorus-Five
19 changes: 7 additions & 12 deletions core/p5.webapp/modules/bazar/fetch-apps.hl
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,23 @@ if:x:/@p5.web.application.get/*
* filename characters.
*/
{_url}:x:?value
p5.crypto.hash.create-sha256:x:/@_url?value
replace:x:/@p5.crypto.hash.create-sha256?value
src:+
replace:x:/@replace?value
src:=
replace:x:/@replace?value
src:/
p5.crypto.hash.create-sha1:x:/@_url?value
hex:true

/*
* Then checking if there even exists a local cache of file from our currently iterated Bazar.
*/
if
fetch:x:/0/0?value
file-exists:~/documents/private/bazar-cache/{0}.hl
:x:/@replace?value
:x:/@p5.crypto.hash.create-sha1?value

/*
* There exists a cache of currently iterated Bazar, now reading its "last write time", and making
* sure we pass in that date as the value of our "If-Modified-Since" HTTP header.
*/
p5.io.file.get-last-write-time:~/documents/private/bazar-cache/{0}.hl
:x:/@replace?value
:x:/@p5.crypto.hash.create-sha1?value
eval-x:x:/+/*/*
add:x:/..try/*/p5.http.get
src
Expand All @@ -123,16 +118,16 @@ if:x:/@p5.web.application.get/*
/*
* Checking server's response.
*/
if:x:/@p5.http.get/*/status?value.int
!=:int:304
if:x:/@p5.http.get/*/result/*/status?value
=:OK

/*
* File has been modified on server since it was cached.
*
* Making sure we cache Bazar file's content locally.
*/
save-file:~/documents/private/bazar-cache/{0}.hl
:x:/@replace?value
:x:/@p5.crypto.hash.create-sha1?value
src:x:/@p5.http.get/*/result/*/content?value

catch
Expand Down

0 comments on commit 8c4fef1

Please sign in to comment.