From c0b3b73c8838e7bc6850d2f6934e8a81a083c6f6 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Nov 2018 23:08:43 -0500 Subject: [PATCH] Move files from util to mods - Move local.config.vagrant.php - Move fpostit - Move bookmarklet-share2friendica - Updated Readme file --- bin/dev/vagrant_provision.sh | 2 +- mods/README.md | 36 ++++++++++++++++++ .../bookmarklet-share2friendica/README.md | 0 .../bookmarklet-share2friendica.js | 0 {util => mods}/fpostit/README | 0 {util => mods}/fpostit/fpostit.js | 0 {util => mods}/fpostit/fpostit.php | 0 {util => mods}/fpostit/friendika-32.png | Bin {util => mods}/local.config.vagrant.php | 0 mods/redme.txt | 31 --------------- 10 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 mods/README.md rename {util => mods}/bookmarklet-share2friendica/README.md (100%) rename {util => mods}/bookmarklet-share2friendica/bookmarklet-share2friendica.js (100%) rename {util => mods}/fpostit/README (100%) rename {util => mods}/fpostit/fpostit.js (100%) rename {util => mods}/fpostit/fpostit.php (100%) rename {util => mods}/fpostit/friendika-32.png (100%) rename {util => mods}/local.config.vagrant.php (100%) delete mode 100644 mods/redme.txt diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh index 440a7b590c..7ebbdcafd4 100755 --- a/bin/dev/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -86,7 +86,7 @@ cd /var/www php bin/composer.phar install # initial config file for friendica in vagrant -cp /vagrant/util/local.config.vagrant.php /vagrant/config/local.config.php +cp /vagrant/mods/local.config.vagrant.php /vagrant/config/local.config.php # copy the .htaccess-dist file to .htaccess so that rewrite rules work cp /vagrant/.htaccess-dist /vagrant/.htaccess diff --git a/mods/README.md b/mods/README.md new file mode 100644 index 0000000000..917fcccd82 --- /dev/null +++ b/mods/README.md @@ -0,0 +1,36 @@ +Friendica mods files +==================== + +## `bookmarklet-share2friendica` + +Browser bookmarklet to share any page with your Friendica account. +Please see `bookmarklet-share2friendica/README.md` for detailed instruction. + +## `fpostit` + +Node-agnostic Friendica bookmarklet by Devlon Duthie. +Unmaintained and unsupported. + +## `home.css` and `home.html` + +Example files to customize the landing page of your Friendica node. +The `home.html file` contains the text of the page, the `home.css` file the style information. +The login box will be added according to the other system settings. +Both files have to be placed in the base directory of your Friendica installation to be used for the landing page. + +## `local.config.vagrant.php` + +Configuration file used by the Vagrant setup script. + +## `sample-Lighttpd.config` and `sample-nginx.config` + +Sample configuration files to use Friendica with Lighttpd or Nginx. +Please check software documentation to know how modify these examples to make them work on your server. + +## `sample-systemd.timer` and `sample-systemd.service` + +Sample systemd unit files to start worker.php periodically. + +Please place them in the correct location for your system, typically this is `/etc/systemd/system/friendicaworker.timer` and `/etc/systemd/system/friendicaworker.service`. +Please report problems and improvements to `!helpers@forum.friendi.ca` and `@utzer@social.yl.ms` or open an issue in [the Github Friendica page](https://github.com/friendica/friendica/issues). +This is for usage of systemd instead of cron to start the worker periodically, the solution is a work-in-progress and can surely be improved. diff --git a/util/bookmarklet-share2friendica/README.md b/mods/bookmarklet-share2friendica/README.md similarity index 100% rename from util/bookmarklet-share2friendica/README.md rename to mods/bookmarklet-share2friendica/README.md diff --git a/util/bookmarklet-share2friendica/bookmarklet-share2friendica.js b/mods/bookmarklet-share2friendica/bookmarklet-share2friendica.js similarity index 100% rename from util/bookmarklet-share2friendica/bookmarklet-share2friendica.js rename to mods/bookmarklet-share2friendica/bookmarklet-share2friendica.js diff --git a/util/fpostit/README b/mods/fpostit/README similarity index 100% rename from util/fpostit/README rename to mods/fpostit/README diff --git a/util/fpostit/fpostit.js b/mods/fpostit/fpostit.js similarity index 100% rename from util/fpostit/fpostit.js rename to mods/fpostit/fpostit.js diff --git a/util/fpostit/fpostit.php b/mods/fpostit/fpostit.php similarity index 100% rename from util/fpostit/fpostit.php rename to mods/fpostit/fpostit.php diff --git a/util/fpostit/friendika-32.png b/mods/fpostit/friendika-32.png similarity index 100% rename from util/fpostit/friendika-32.png rename to mods/fpostit/friendika-32.png diff --git a/util/local.config.vagrant.php b/mods/local.config.vagrant.php similarity index 100% rename from util/local.config.vagrant.php rename to mods/local.config.vagrant.php diff --git a/mods/redme.txt b/mods/redme.txt deleted file mode 100644 index 8fc1c48b32..0000000000 --- a/mods/redme.txt +++ /dev/null @@ -1,31 +0,0 @@ -sample-Lighttpd.config -sample-nginx.config - - Sample configuration files to use Friendica with Lighttpd - or Nginx. Pleas check software documentation to know how modify - these examples to make them work on your server. - - -sample-systemd.timer -sample-systemd.service - - Sample systemd unit files to start worker.php periodically. - - Please place them in the correct location for your system, - typically this is /etc/systemd/system/friendicaworker.timer - and /etc/systemd/system/friendicaworker.service. - Please report problems and improvements to - !helpers@forum.friendi.ca and @utzer@social.yl.ms or open an - issue in Github (https://github.com/friendica/friendica/issues). - This is for usage of systemd instead of cron to start the worker.php - periodically, the solution is work-in-progress and can surely be improved. - -home.css -home.html - - Example files to customize the landing page of your Friendica node. - The home.html file contains the text of the page, the home.css file - the style information. The login box will be added according to the - other system settings. - Both files have to be placed in the base directory of your Friendica - installation to be used for the landing page.