ansible-playbooks/general#85 Linting [skip-ci]

defaults/main.yml

+---
+
 discourse_git_repo: https://github.com/discourse/discourse_docker.git
 discourse_domain:

tasks/apache.yml

@@ -9,22 +9,24 @@
     group: root
     mode: 0664
   notify:
-    - "Apache | Restart Apache"
+    - "Restart Apache"
 
 - name: Apache enable our new site(s)
-  command: a2ensite discourse creates=/etc/apache2/sites-enabled/discourse{{ apache_conf_ext }}
+  command: a2ensite discourse
+  args:
+    creates: /etc/apache2/sites-enabled/discourse{{ apache_conf_ext }}
   notify:
-    - "Apache | Restart Apache"
+    - "Restart Apache"
 
 - block:
 
-  - name: Setup AuthType Basic
-    htpasswd:
-      path: /var/discourse/containers/passwords
-      name: '{{ discourse_apache_auth.user }}'
-      password: '{{ discourse_apache_auth.password }}'
-      owner: root
-      group: root
-      mode: 0664
+    - name: Setup AuthType Basic
+      htpasswd:
+        path: /var/discourse/containers/passwords
+        name: '{{ discourse_apache_auth.user }}'
+        password: '{{ discourse_apache_auth.password }}'
+        owner: root
+        group: root
+        mode: 0664
 
   when: discourse_apache_auth is defined

tasks/install.yml

@@ -10,16 +10,16 @@
 
 - block:
 
-  - name: Configure
-    template:
-      src: app.yml
-      dest: /var/discourse/containers/app.yml
-      owner: root
-      group: root
-      mode: 0664
+    - name: Configure
+      template:
+        src: app.yml
+        dest: /var/discourse/containers/app.yml
+        owner: root
+        group: root
+        mode: 0664
 
-  - name: Install and Build
-    shell: /var/discourse/launcher rebuild app
+    - name: Install and Build
+      shell: /var/discourse/launcher rebuild app
 
   when: discourse_repository.changed
 

tasks/main.yml

@@ -8,19 +8,19 @@
     - always
 
 - block:
-  - name: Install Certs
-    include_tasks: ../../letsencrypt/tasks/cert.yml
-    with_items:
-      - domain: '{{ discourse_domain }}'
-    loop_control:
-      loop_var: domain
-    when: discourse_protocol|default("https") == "https" and discourse_letsencrypt|default(true)
+    - name: Install Certs
+      include_tasks: ../../letsencrypt/tasks/cert.yml
+      with_items:
+        - domain: '{{ discourse_domain }}'
+      loop_control:
+        loop_var: domain
+      when: discourse_protocol|default("https") == "https" and discourse_letsencrypt|default(true)
 
   when: not excluded_roles or "letsencrypt" not in excluded_roles and groups.proxyserver is not defined
 
 - block:
 
-  - name: Install Discourse
-    import_tasks: install.yml
+    - name: Install Discourse
+      import_tasks: install.yml
 
   when: not excluded_roles or "discourse" not in excluded_roles

templates/app.yml

+---
+
 ## this is the all-in-one, standalone Discourse Docker container template
 ##
 ## After making changes to this file, you MUST rebuild
@@ -12,31 +14,31 @@ templates:
   - "templates/redis.template.yml"
   - "templates/web.template.yml"
   - "templates/web.ratelimited.template.yml"
-#  - "templates/web.socketed.template.yml"
-## Uncomment these two lines if you wish to add Lets Encrypt (https)
-  #- "templates/web.ssl.template.yml"
-  #- "templates/web.letsencrypt.ssl.template.yml"
+  # - "templates/web.socketed.template.yml"
+  ## Uncomment these two lines if you wish to add Lets Encrypt (https)
+  # - "templates/web.ssl.template.yml"
+  # - "templates/web.letsencrypt.ssl.template.yml"
 
 ## which TCP/IP ports should this container expose?
 ## If you want Discourse to share a port with another webserver like Apache or nginx,
 ## see https://meta.discourse.org/t/17247 for details
 expose:
   - "8181:80"
-#  - "80:80" # https
-#  - "443:443" # https
+  # - "80:80" # https
+  # - "443:443" # https
 
 params:
   db_default_text_search_config: "pg_catalog.english"
 
   ## Set db_shared_buffers to a max of 25% of the total memory.
   ## will be set automatically by bootstrap based on detected RAM, or you can override
-  #db_shared_buffers: "256MB"
+  # db_shared_buffers: "256MB"
 
   ## can improve sorting performance, but adds memory usage per-connection
-  #db_work_mem: "40MB"
+  # db_work_mem: "40MB"
 
   ## Which Git revision should this container use? (default: tests-passed)
-  #version: tests-passed
+  # version: tests-passed
 
 env:
   LANG: en_US.UTF-8
@@ -44,14 +46,14 @@ env:
 
   ## How many concurrent web requests are supported? Depends on memory and CPU cores.
   ## will be set automatically by bootstrap based on detected CPUs, or you can override
-  #UNICORN_WORKERS: 3
+  # UNICORN_WORKERS: 3
 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: '{{ discourse_domain }}'
 
   ## Uncomment if you want the container to be started with the same
   ## hostname (-h option) as specified above (default "$hostname-$config")
-  #DOCKER_USE_HOSTNAME: true
+  # DOCKER_USE_HOSTNAME: true
 
   ## TODO: List of comma delimited emails that will be made admin and developer
   ## on initial signup example 'user1@example.com,user2@example.com'
@@ -62,14 +64,14 @@ env:
   DISCOURSE_SMTP_PORT: '{{ discourse_smtp.port }}'
   DISCOURSE_SMTP_USER_NAME: '{{ discourse_smtp.user }}'
   DISCOURSE_SMTP_PASSWORD: "{{ discourse_smtp.pass }}"
-  #DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)
+  # DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)
 
   ## If you added the Lets Encrypt template, uncomment below to get a free SSL certificate
-  #LETSENCRYPT_ACCOUNT_EMAIL: me@example.com
+  # LETSENCRYPT_ACCOUNT_EMAIL: me@example.com
 
   ## The CDN address for this Discourse instance (configured to pull)
   ## see https://meta.discourse.org/t/14857 for details
-  #DISCOURSE_CDN_URL: //discourse-cdn.example.com
+  # DISCOURSE_CDN_URL: //discourse-cdn.example.com
 
 ## The Docker container is stateless; all data is stored in /shared
 volumes:
@@ -94,5 +96,5 @@ run:
   - exec: echo "Beginning of custom commands"
   ## If you want to set the 'From' email address for your first registration, uncomment and change:
   ## After getting the first signup email, re-comment the line. It only needs to run once.
-  #- exec: rails r "SiteSetting.notification_email='info@unconfigured.discourse.org'"
+  # - exec: rails r "SiteSetting.notification_email='info@unconfigured.discourse.org'"
   - exec: echo "End of custom commands"