Skip to content

Fix/mysqldump #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/6.0/en/cli.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@ Usage: phpbu [option]
</listitem>
</varlistentry>

<varlistentry>
<term><literal>--restore</literal></term>
<listitem>
<para>
Output a guide how to restore your backup.
For this to work all your <literal>Sources</literal> and <literal>Crypts</literal> have to implement the <literal>Restorable</literal> interface
</para>
</listitem>
</varlistentry>

<varlistentry>
<term><literal>--simulate</literal></term>
<listitem>
Expand Down Expand Up @@ -135,7 +145,7 @@ Usage: phpbu [option]
<caution>
<title>Warning</title>
<para>
If phpbu has to use any kind of credentials executing a binaries, like for example the
If phpbu has to use any kind of credentials executing a binary, like for example the
<literal>mysqldump</literal> command, this credentials will maybe displayed in the simulation output.
</para>
</caution>
Expand Down
68 changes: 68 additions & 0 deletions src/6.0/en/logging.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,74 @@

</section>

<section id="logging.telegram">
<title>Telegram</title>

<para>
You can log to a Telegram group or contact.
</para>
<table id="logging.tables.options.telegram">
<title>Telegram-Options</title>
<tgroup cols="5" align="left" colsep="1" rowsep="1">
<thead>
<row>
<entry>Name</entry>
<entry>Value</entry>
<entry>Required</entry>
<entry>Default</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>chat_id</entry>
<entry>string</entry>
<entry>yes</entry>
<entry>-</entry>
<entry>Telegram chat ID</entry>
</row>
<row>
<entry>bot_id</entry>
<entry>string</entry>
<entry>no</entry>
<entry>-</entry>
<entry>Telegram bot ID.</entry>
</row>
<row>
<entry>bot_token</entry>
<entry>string</entry>
<entry>no</entry>
<entry>-</entry>
<entry>Telegram bot authentication token.</entry>
</row>
</tbody>
</tgroup>
</table>

<example id="logging.telegram.example.xml">
<title>Telegram XML example</title>
<programlisting><![CDATA[<!-- write to Telegram chat -->
<log type="telegram">
<option name="chat_id" value="YOUR_CHAT_ID"/>
<option name="bot_id" value="YOUR_BOT_ID"/>
<option name="bot_token" value="YOUR_BOT_TOKEN"/>
</log>]]></programlisting>
</example>

<example id="logging.telegram.example.json">
<title>Telegram JSON example</title>
<programlisting><![CDATA[{
"type": "telegram",
"options": {
"chat_id": "YOUR_CHAT_ID",
"bot_id": "YOUR_BOT_ID",
"bot_token": "YOUR_BOT_TOKEN"
}
}]]></programlisting>
</example>

</section>

<section id="logging.webhook">

<title>Webhook</title>
Expand Down
11 changes: 9 additions & 2 deletions src/6.0/en/source.xml
Original file line number Diff line number Diff line change
Expand Up @@ -550,11 +550,18 @@
<entry>Use the --single-transaction option to add BEGIN SQL statement before dumping data from server.</entry>
</row>
<row>
<entry>extendedInsert</entry>
<entry>skipExtendedInsert</entry>
<entry>true | false</entry>
<entry>no</entry>
<entry>false</entry>
<entry>Use multiple-row INSERT syntax. This results in a smaller dump file and speeds up inserts when the file is reloaded.</entry>
<entry>Do not use multiple-row INSERT syntax.</entry>
</row>
<row>
<entry>skipTriggers</entry>
<entry>true | false</entry>
<entry>no</entry>
<entry>false</entry>
<entry>Do not execute triggers during backup.</entry>
</row>
<row>
<entry>pathToMysqldump</entry>
Expand Down