From 3fdc245d82c61d09ab752fdb945acee9a1fe57dd Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sat, 9 Mar 2024 10:35:07 -0600 Subject: [PATCH] Replace ":noweb yes" with ":noweb no-export". There were no noweb references in the exported HTML! --- README.org | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/README.org b/README.org index 63eb954..da9e560 100644 --- a/README.org +++ b/README.org @@ -1304,7 +1304,7 @@ follows these recommendations (and /not/ the suggestion to enable ~systemd~ package). #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/all/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/all/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/all/tasks/main.yml :noweb no-export - name: Install systemd-resolved. become: yes @@ -1696,7 +1696,7 @@ Debian default for ~inet_interfaces~. #+NAME: postfix-front #+CAPTION: ~postfix-front~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export - { p: smtpd_tls_cert_file, v: /etc/server.crt } - { p: smtpd_tls_key_file, v: /etc/server.key } <> @@ -1713,7 +1713,7 @@ The following Ansible tasks install Postfix, modify start and enable the service. #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb no-export - name: Install Postfix. become: yes @@ -1822,7 +1822,7 @@ The following Ansible tasks install Dovecot's IMAP daemon and its and enables it to start at every reboot. #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb no-export - name: Install Dovecot IMAPd. become: yes @@ -1937,7 +1937,7 @@ used on all of the institute's web sites. #+NAME: apache-userdir-front #+CAPTION: ~apache-userdir-front~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export UserDir /home/www-users Require all granted @@ -1973,7 +1973,7 @@ the inside of a ~VirtualHost~ block. They should apply globally. #+NAME: apache-front #+CAPTION: ~apache-front~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export ServerName {{ domain_name }} ServerAdmin webmaster@{{ domain_name }} @@ -2006,7 +2006,7 @@ e.g. =/etc/apache2/sites-available/small.example.org.conf= and runs ~a2ensite -q small.example.org~ to enable it. #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb no-export - name: Install Apache2. become: yes @@ -2164,7 +2164,7 @@ and the common options discussed in [[*The VPN Services][The VPN Service]]. #+NAME: openvpn-front #+CAPTION: ~openvpn-front~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export server {{ public_vpn_net_and_mask }} client-config-dir /etc/openvpn/ccd <> @@ -2186,7 +2186,7 @@ Finally, here are the tasks (and handler) required to install and configure the OpenVPN server on Front. #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb no-export - name: Install OpenVPN. become: yes @@ -2304,7 +2304,7 @@ starts). The first step is to install Kamailio. #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb no-export - name: Install Kamailio. become: yes @@ -2347,7 +2347,7 @@ be started before the ~tun~ device has appeared. Finally, Kamailio can be configured and started. #+CAPTION: [[file:roles_t/front/tasks/main.yml][=roles_t/front/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/front/tasks/main.yml :noweb no-export - name: Configure Kamailio. become: yes @@ -2627,7 +2627,7 @@ addresses to private domain names. The following tasks install and configure BIND9 on Core. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install BIND9. become: yes @@ -3010,7 +3010,7 @@ Core uses NTP to provide a time synchronization service to the campus. The default daemon's default configuration is fine. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install NTP. become: yes @@ -3075,7 +3075,7 @@ The complete list of Core's Postfix settings for #+NAME: postfix-core #+CAPTION: ~postfix-core~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export <> - { p: smtpd_tls_security_level, v: none } - { p: smtp_tls_security_level, v: none } @@ -3093,7 +3093,7 @@ enable the service. Whenever =/etc/postfix/transport= is changed, the ~postmap transport~ command must also be run. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install Postfix. become: yes @@ -3199,7 +3199,7 @@ The following Ansible tasks install Dovecot's IMAP daemon and its and enables it to start at every reboot. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install Dovecot IMAPd. become: yes @@ -3292,7 +3292,7 @@ notebook, only members with a ~fetchmail_password~ key will be provided the Core service. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install fetchmail. become: yes @@ -3406,7 +3406,7 @@ naming a sub-directory in the member's home directory on Core. The #+NAME: apache-userdir-core #+CAPTION: ~apache-userdir-core~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export UserDir Public/HTML Require all granted @@ -3420,7 +3420,7 @@ redirect, the encryption ciphers and certificates. #+NAME: apache-live #+CAPTION: ~apache-live~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export ServerName live ServerAlias live.{{ domain_priv }} @@ -3446,7 +3446,7 @@ familiar. #+NAME: apache-test #+CAPTION: ~apache-test~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export ServerName test ServerAlias test.{{ domain_priv }} @@ -3474,7 +3474,7 @@ trained staffers, monitored by a revision control system, etc. #+NAME: apache-campus #+CAPTION: ~apache-campus~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export ServerName www ServerAlias www.{{ domain_priv }} @@ -3541,7 +3541,7 @@ directory into which the above site configurations can be installed. The ~a2ensite~ command enables them. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install live web site. become: yes @@ -3656,7 +3656,7 @@ called ~openvpn@front~. #+NAME: openvpn-core #+CAPTION: ~openvpn-core~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export client dev-type tun dev ovpn @@ -3677,7 +3677,7 @@ The tasks that install and configure the OpenVPN client configuration for Core. #+CAPTION: [[file:roles_t/core/tasks/main.yml][=roles_t/core/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml :noweb no-export - name: Install OpenVPN. become: yes @@ -4916,7 +4916,7 @@ command after Gate is configured or new gate is "in position" : sudo ufw enable #+CAPTION: [[file:roles_t/gate/tasks/main.yml][=roles_t/gate/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/gate/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/gate/tasks/main.yml :noweb no-export - name: Install UFW. become: @@ -5090,7 +5090,7 @@ discussed in [[*The VPN Services][The VPN Services]]. #+NAME: openvpn-gate #+CAPTION: ~openvpn-gate~ -#+BEGIN_SRC conf :noweb yes +#+BEGIN_SRC conf :noweb no-export server {{ campus_vpn_net_and_mask }} client-config-dir /etc/openvpn/ccd <> @@ -5112,7 +5112,7 @@ Finally, here are the tasks (and handler) required to install and configure the OpenVPN server on Gate. #+CAPTION: [[file:roles_t/gate/tasks/main.yml][=roles_t/gate/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/gate/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/gate/tasks/main.yml :noweb no-export - name: Install OpenVPN. become: yes @@ -5329,7 +5329,7 @@ tasks below. - System mail name: new.small.private #+CAPTION: [[file:roles_t/campus/tasks/main.yml][=roles_t/campus/tasks/main.yml=]] -#+BEGIN_SRC conf :tangle roles_t/campus/tasks/main.yml :noweb yes +#+BEGIN_SRC conf :tangle roles_t/campus/tasks/main.yml :noweb no-export - name: Install Postfix. become: yes @@ -6595,7 +6595,7 @@ up-restart #+END_SRC #+CAPTION: [[file:inst][=inst=]] -#+BEGIN_SRC perl :tangle inst :noweb yes +#+BEGIN_SRC perl :tangle inst :noweb no-export sub write_template ($$$$$$$$$); sub read_file ($); sub add_client ($$$); -- 2.25.1