gerrit.wikimedia.org
Gitiles
Code ReviewSign In
gerrit.wikimedia.org / operations / debs / wmf-sre-laptop / 19a05fc3040f0b721eb4bd53c67005f59f3e4c5c^! / .
commit19a05fc3040f0b721eb4bd53c67005f59f3e4c5c[log] [tgz]
authorJohn Bond <github@johnbond.org>Wed Nov 25 11:11:02 2020 +0100
committerJohn Bond <github@johnbond.org>Wed Nov 25 12:19:42 2020 +0100
tree4032789ada5cef5fd4fdac3d1b4e0688cbb366af
parent24dc508eb56ae8a623b646cb1ba184052c56ff90 [diff]
wmf-laptop-dnsmasq: move docs to correct location I noticed that the dnsmasq docs only get installed with the laptop package this CR updates the config to install the docs with the correct package and in the correct location Change-Id: If2f9a244c0c3284820ae615e5bee3cde35fa34dc
diff --git a/debian/changelog b/debian/changelog index 9ad9789..e5eb8e1 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,10 @@ +wmf-laptop (0.3.1) buster-wikimedia; urgency=medium++ [ John Bond ]+ * Fix documentation installation for wmf-laptop-dnsmasq package++ -- John Bond <jbond@wikimedia.org> Wed, 25 Nov 2020 11:32:38 +0100+ wmf-laptop (0.3) buster; urgency=medium [ John Bond ]
diff --git a/debian/wmf-laptop-dnsmasq.docs b/debian/wmf-laptop-dnsmasq.docs new file mode 100644 index 0000000..b2afc33 --- /dev/null +++ b/debian/wmf-laptop-dnsmasq.docs
@@ -0,0 +1 @@ +docs/wmf-laptop-dnsmasq/*
diff --git a/debian/wmf-laptop-sre.docs b/debian/wmf-laptop-sre.docs index d3a1239..27d3e29 100644 --- a/debian/wmf-laptop-sre.docs +++ b/debian/wmf-laptop-sre.docs
@@ -1 +1 @@ -docs/* \ No newline at end of file +docs/wmf-laptop-sre/*
diff --git a/docs/wmf-laptop-dnsmasq/README b/docs/wmf-laptop-dnsmasq/README new file mode 100644 index 0000000..8bcd68f --- /dev/null +++ b/docs/wmf-laptop-dnsmasq/README
@@ -0,0 +1,5 @@ ++The following docs/configs are included:++Ensure dnsmasq service is correctly running and started via NetworkManager​+/usr/share/doc/wmf-sre-dnsmasq/SETUP.dnsmasq
diff --git a/docs/SETUP.dnsmasq b/docs/wmf-laptop-dnsmasq/SETUP similarity index 92% rename from docs/SETUP.dnsmasq rename to docs/wmf-laptop-dnsmasq/SETUP index 34ff0d6..9145e40 100644 --- a/docs/SETUP.dnsmasq +++ b/docs/wmf-laptop-dnsmasq/SETUP
@@ -1,7 +1,7 @@ - Network manager dnsmasq integration conflicts interferes with the dnsmasq service as such you will need to perform the following steps after installation systemctl disable dnsmasq-+ systemctl stop dnsmasq systemctl restart NetworkManager
diff --git a/docs/README b/docs/wmf-laptop-sre/README similarity index 85% rename from docs/README rename to docs/wmf-laptop-sre/README index 0524f86..2469e2f 100644 --- a/docs/README +++ b/docs/wmf-laptop-sre/README
@@ -18,6 +18,3 @@ resolution. It also configures dnsmasq to automatically forward queries for the following domains to the wikimedia name servers * (eqiad|codfw|esams|ulsfo|eqsin).wmnet​-​-Ensure dnsmasq service is correctly running and started via NetworkManager​-/usr/share/doc/wmf-sre-laptop/SETUP.dnsmasq
diff --git a/docs/SETUP.git b/docs/wmf-laptop-sre/SETUP.git similarity index 100% rename from docs/SETUP.git rename to docs/wmf-laptop-sre/SETUP.git
diff --git a/docs/SETUP.pwstore b/docs/wmf-laptop-sre/SETUP.pwstore similarity index 100% rename from docs/SETUP.pwstore rename to docs/wmf-laptop-sre/SETUP.pwstore
diff --git a/docs/SETUP.ssh b/docs/wmf-laptop-sre/SETUP.ssh similarity index 100% rename from docs/SETUP.ssh rename to docs/wmf-laptop-sre/SETUP.ssh
Powered by Gitiles
txt
json