Page MenuHomeDevCentral
Files F4021044

D1287.id3311.diff
No OneTemporary
Actions

D1287.id3311.diff
View Options

diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
Nasqueron operations
====================
-Welcome to **[rOPS](https://devcentral.nasqueron.org/diffusion/OPS/)**, the Nasqueron operations repository.
+Welcome to **[rOPS](https://devcentral.nasqueron.org/diffusion/OPS/)**,
+the Nasqueron operations repository.
----------
@@ -81,4 +82,3 @@
When this is not the case, the code is licensed under
[BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause)
if not otherwise specified.
-
diff --git a/pillar/viperserv/bots.sls b/pillar/viperserv/bots.sls
--- a/pillar/viperserv/bots.sls
+++ b/pillar/viperserv/bots.sls
@@ -1,5 +1,4 @@
-# To regenerate the list of scripts in a folder, try:
-# find . -type f -name '*.tcl' | grep -v tests/ | grep -v Maintenance/ | grep -v ForUsers/ | grep -v PreSurfBoard | sed 's@\./@ - @'
+# To regenerate the list of scripts in a folder, try `make list` from rVIPER.
viperserv_accounts:
viperserv:
diff --git a/roles/mailserver/systemd-unit/files/lxc-container-mailserver-start.sh b/roles/mailserver/systemd-unit/files/lxc-container-mailserver-start.sh
--- a/roles/mailserver/systemd-unit/files/lxc-container-mailserver-start.sh
+++ b/roles/mailserver/systemd-unit/files/lxc-container-mailserver-start.sh
@@ -16,7 +16,9 @@
# and will be lost if the state is redeployed.
# </auto-generated>
-#Let systemd launch a lxc mail container through /usr/lib/systemd/system/lxc-container-mailserver.service
+#Let systemd launch a lxc mail container through
+#/usr/lib/systemd/system/lxc-container-mailserver.service
+#
#Start a lxc container, and create iptable rules
IPTABLES="/usr/sbin/iptables"
diff --git a/roles/paas-docker/systemd-unit/files/get-containers-list.sh b/roles/paas-docker/systemd-unit/files/get-containers-list.sh
--- a/roles/paas-docker/systemd-unit/files/get-containers-list.sh
+++ b/roles/paas-docker/systemd-unit/files/get-containers-list.sh
@@ -29,7 +29,8 @@
fi
# Get names in an array
-# 21:42 <geirha> since bash 4, you can use mapfile instead of that while read loop. mapfile -t array < "$file"
+# 21:42 <geirha> since bash 4, you can use mapfile instead of that
+# while read loop. mapfile -t array < "$file"
mapfile -t array < "$file"
# Test argument to know in wich order return names
diff --git a/roles/webserver-content/README.md b/roles/webserver-content/README.md
--- a/roles/webserver-content/README.md
+++ b/roles/webserver-content/README.md
@@ -26,8 +26,8 @@
1. Create a new folder hierarchy for the domain
2. Include a `init.sls` file for your subdomains
3. Declare the new domain in pillar/webserver/sites.sls
- 4. Regenerate the role index with utils/generate-webcontent-index.py (or make)
- utils/generate-webcontent-index.py > roles/webserver-content/init.sls
+ 4. Regenerate the role index with `make` (from repository root)
+
For example the tld/acme/init.sls file could be:
```
diff --git a/scripts/byOS/Fedora/new-partition.sh b/scripts/byOS/Fedora/new-partition.sh
--- a/scripts/byOS/Fedora/new-partition.sh
+++ b/scripts/byOS/Fedora/new-partition.sh
@@ -2,7 +2,8 @@
#
# Adds a new partition to a device mapper volume group
#
-# Usage ..... new-partition <device> <volume group> <logical volume name> [mounting point]
+# Usage ..... new-partition <device> <volume group>
+# <logical volume name> [mounting point]
# Example ... new-partition /dev/sdb1 centos_dwellers wharf /wharf
# (or) new-partition /dev/sdb1 centos_dwellers wharf
#
@@ -12,7 +13,8 @@
# Parses arguments
if [ $# -lt 3 ] || [ $# -gt 4 ]; then
- echo 'Usage: new-partition <device> <volume group> <logical volume name> [mounting point]'
+ echo 'Usage: new-partition <device> <volume group>'
+ echo ' <logical volume name> [mounting point]'
exit 1
fi

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 20, 08:34 (14 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2361200
Default Alt Text
D1287.id3311.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator