aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-05 22:43:43 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-05 22:43:43 +0200
commit17d004d52b1e5d6af39f2c55613c90c25b1dea84 (patch)
tree27ce091b94f14e2ae645e913efc7dbe45321c46a
parenta74631b55456bdbe24594bfc40c6e12bfa44c196 (diff)
parentd94e61a7b627381715751fb6cb6c0cecf7ece3f9 (diff)
downloadvolse-hubzilla-17d004d52b1e5d6af39f2c55613c90c25b1dea84.tar.gz
volse-hubzilla-17d004d52b1e5d6af39f2c55613c90c25b1dea84.tar.bz2
volse-hubzilla-17d004d52b1e5d6af39f2c55613c90c25b1dea84.zip
Merge remote-tracking branch 'openshift/master'
-rw-r--r--.openshift/README.md5
-rw-r--r--.openshift/action_hooks/README.md3
-rw-r--r--.openshift/cron/README.cron27
-rw-r--r--.openshift/cron/daily/.gitignore0
-rw-r--r--.openshift/cron/hourly/.gitignore0
-rw-r--r--.openshift/cron/minutely/.gitignore0
-rw-r--r--.openshift/cron/monthly/.gitignore0
-rw-r--r--.openshift/cron/weekly/README16
-rw-r--r--.openshift/cron/weekly/chrono.dat1
-rwxr-xr-x.openshift/cron/weekly/chronograph3
-rw-r--r--.openshift/cron/weekly/jobs.allow12
-rw-r--r--.openshift/cron/weekly/jobs.deny7
-rw-r--r--.openshift/markers/README.md4
-rw-r--r--.openshift/pear.txt0
14 files changed, 78 insertions, 0 deletions
diff --git a/.openshift/README.md b/.openshift/README.md
new file mode 100644
index 000000000..68061ca57
--- /dev/null
+++ b/.openshift/README.md
@@ -0,0 +1,5 @@
+The OpenShift `php` cartridge documentation can be found at:
+http://openshift.github.io/documentation/oo_cartridge_guide.html#php
+
+For information about .openshift directory, consult the documentation:
+http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory
diff --git a/.openshift/action_hooks/README.md b/.openshift/action_hooks/README.md
new file mode 100644
index 000000000..541319581
--- /dev/null
+++ b/.openshift/action_hooks/README.md
@@ -0,0 +1,3 @@
+For information about action hooks, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#action-hooks
diff --git a/.openshift/cron/README.cron b/.openshift/cron/README.cron
new file mode 100644
index 000000000..ac77f7872
--- /dev/null
+++ b/.openshift/cron/README.cron
@@ -0,0 +1,27 @@
+Run scripts or jobs on a periodic basis
+=======================================
+Any scripts or jobs added to the minutely, hourly, daily, weekly or monthly
+directories will be run on a scheduled basis (frequency is as indicated by the
+name of the directory) using run-parts.
+
+run-parts ignores any files that are hidden or dotfiles (.*) or backup
+files (*~ or *,) or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved}
+
+The presence of two specially named files jobs.deny and jobs.allow controls
+how run-parts executes your scripts/jobs.
+ jobs.deny ===> Prevents specific scripts or jobs from being executed.
+ jobs.allow ===> Only execute the named scripts or jobs (all other/non-named
+ scripts that exist in this directory are ignored).
+
+The principles of jobs.deny and jobs.allow are the same as those of cron.deny
+and cron.allow and are described in detail at:
+ http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-Automating_System_Tasks.html#s2-autotasks-cron-access
+
+See: man crontab or above link for more details and see the the weekly/
+ directory for an example.
+
+PLEASE NOTE: The Cron cartridge must be installed in order to run the configured jobs.
+
+For more information about cron, consult the documentation:
+http://openshift.github.io/documentation/oo_cartridge_guide.html#cron
+http://openshift.github.io/documentation/oo_user_guide.html#cron
diff --git a/.openshift/cron/daily/.gitignore b/.openshift/cron/daily/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/.openshift/cron/daily/.gitignore
diff --git a/.openshift/cron/hourly/.gitignore b/.openshift/cron/hourly/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/.openshift/cron/hourly/.gitignore
diff --git a/.openshift/cron/minutely/.gitignore b/.openshift/cron/minutely/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/.openshift/cron/minutely/.gitignore
diff --git a/.openshift/cron/monthly/.gitignore b/.openshift/cron/monthly/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/.openshift/cron/monthly/.gitignore
diff --git a/.openshift/cron/weekly/README b/.openshift/cron/weekly/README
new file mode 100644
index 000000000..7c3e659fe
--- /dev/null
+++ b/.openshift/cron/weekly/README
@@ -0,0 +1,16 @@
+Run scripts or jobs on a weekly basis
+=====================================
+Any scripts or jobs added to this directory will be run on a scheduled basis
+(weekly) using run-parts.
+
+run-parts ignores any files that are hidden or dotfiles (.*) or backup
+files (*~ or *,) or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} and handles
+the files named jobs.deny and jobs.allow specially.
+
+In this specific example, the chronograph script is the only script or job file
+executed on a weekly basis (due to white-listing it in jobs.allow). And the
+README and chrono.dat file are ignored either as a result of being black-listed
+in jobs.deny or because they are NOT white-listed in the jobs.allow file.
+
+For more details, please see ../README.cron file.
+
diff --git a/.openshift/cron/weekly/chrono.dat b/.openshift/cron/weekly/chrono.dat
new file mode 100644
index 000000000..fc4abb87c
--- /dev/null
+++ b/.openshift/cron/weekly/chrono.dat
@@ -0,0 +1 @@
+Time And Relative D...n In Execution (Open)Shift!
diff --git a/.openshift/cron/weekly/chronograph b/.openshift/cron/weekly/chronograph
new file mode 100755
index 000000000..61de949f4
--- /dev/null
+++ b/.openshift/cron/weekly/chronograph
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "`date`: `cat $(dirname \"$0\")/chrono.dat`"
diff --git a/.openshift/cron/weekly/jobs.allow b/.openshift/cron/weekly/jobs.allow
new file mode 100644
index 000000000..8d32abc70
--- /dev/null
+++ b/.openshift/cron/weekly/jobs.allow
@@ -0,0 +1,12 @@
+#
+# Script or job files listed in here (one entry per line) will be
+# executed on a weekly-basis.
+#
+# Example: The chronograph script will be executed weekly but the README
+# and chrono.dat files in this directory will be ignored.
+#
+# The README file is actually ignored due to the entry in the
+# jobs.deny which is checked before jobs.allow (this file).
+#
+chronograph
+
diff --git a/.openshift/cron/weekly/jobs.deny b/.openshift/cron/weekly/jobs.deny
new file mode 100644
index 000000000..73c945008
--- /dev/null
+++ b/.openshift/cron/weekly/jobs.deny
@@ -0,0 +1,7 @@
+#
+# Any script or job files listed in here (one entry per line) will NOT be
+# executed (read as ignored by run-parts).
+#
+
+README
+
diff --git a/.openshift/markers/README.md b/.openshift/markers/README.md
new file mode 100644
index 000000000..8daca526c
--- /dev/null
+++ b/.openshift/markers/README.md
@@ -0,0 +1,4 @@
+For information about markers, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#markers
+http://openshift.github.io/documentation/oo_cartridge_guide.html#php-markers
diff --git a/.openshift/pear.txt b/.openshift/pear.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/.openshift/pear.txt