From 893e5ddce32b83b3fca8db8628059812d8fbfdad Mon Sep 17 00:00:00 2001 From: vitrinekast Date: Tue, 26 Mar 2024 22:20:02 +0100 Subject: [PATCH] indentation nation --- templates/book.jinja | 331 ++++++++++++++++++++++--------------------- 1 file changed, 168 insertions(+), 163 deletions(-) diff --git a/templates/book.jinja b/templates/book.jinja index b0369f0..334524d 100644 --- a/templates/book.jinja +++ b/templates/book.jinja @@ -27,29 +27,29 @@

Debug fiesta!

-      last_user_added: {{ last_user_added}}
-      last_user_added_name: {{ last_user_added_name}}
-      users_created_today: {{ users_created_today}}
-      since_last_boot: {{ since_last_boot}}
-      list_package_installs: {{ list_package_installs}}
-      list_package_upgrade: {{ list_package_upgrade}}
-      list_package_remove: {{ list_package_remove}}
-      device_info: {{ device_info}}
-      days_since_last_boot : {{ days_since_last_boot }}
-      kitchen_services : {{ kitchen_services }}
-      ip_address : {{ ip_address }}
-      logins_today : {{ logins_today }}
-      list_groups : {{ list_groups }}
-      list_active_services : {{ list_active_services }}
-      debian_version : {{ debian_version }}
-      kernel_version : {{ kernel_version }}
-      hostname : {{ hostname }}
-      
-      groups_created : {{ groups_created }}
-      groups_removed : {{ groups_removed }}
-      user_modified : {{ user_modified }}
-      user_deleted : {{ user_deleted }}
-
+last_user_added: {{ last_user_added}} +last_user_added_name: {{ last_user_added_name}} +users_created_today: {{ users_created_today}} +since_last_boot: {{ since_last_boot}} +list_package_installs: {{ list_package_installs}} +list_package_upgrade: {{ list_package_upgrade}} +list_package_remove: {{ list_package_remove}} +device_info: {{ device_info}} +days_since_last_boot : {{ days_since_last_boot }} +kitchen_services : {{ kitchen_services }} +ip_address : {{ ip_address }} +logins_today : {{ logins_today }} +list_groups : {{ list_groups }} +list_active_services : {{ list_active_services }} +debian_version : {{ debian_version }} +kernel_version : {{ kernel_version }} +hostname : {{ hostname }} + +groups_created : {{ groups_created }} +groups_removed : {{ groups_removed }} +user_modified : {{ user_modified }} +user_deleted : {{ user_deleted }} +
@@ -131,7 +131,6 @@ {% if list_package_installs|length > 0 %}

tldr@chopchop:~ $ grep 'install' /var/log/dpkg.log

- Something here in the if statement is not working Today the following packages were installed: @@ -140,20 +139,20 @@ {% for item in list_package_installs %}
  • {{ item }}
    • {% endfor %} - - Packages are often installed to use different software or coding languages or build alternative tools. Often - users have to talk about and consider which packages they need and why, as well as how much storage they take up - and how they will change their interactions with and on their shared server. - + + Packages are often installed to use different software or coding languages or build alternative tools. Often + users have to talk about and consider which packages they need and why, as well as how much storage they take up + and how they will change their interactions with and on their shared server. + {% endif %} {% if list_package_installs|length < 0 %} Today no new packages were installed... This part also not working - {% endif %} + {% endif %} - {% if list_package_upgrade|length > 0 %} + {% if list_package_upgrade|length > 0 %}

    tldr@chopchop:~ $ grep 'upgrade' /var/log/dpkg.log

    Something here in the if statement is not working @@ -163,151 +162,157 @@ {% for item in list_package_upgrade %}
  • {{ item }}
    • {% endfor %} + + + Packages are upgraded to fix Previous bugs they had, or allow new options for usage they did not have prior. + + {% endif %} + {% if list_package_upgrade|length < 0 %} + Out of the installed packages, none were upgraded today... + {% endif %} + + {% if list_package_remove|length > 0 %} +

    tldr@chopchop:~ $ grep 'remove' /var/log/dpkg.log

    + + These package were removed today: + +
      + {% for item in list_package_remove %} +
    • {{ item }}
      • + {% endfor %} - Packages are upgraded to fix Previous bugs they had, or allow new options for usage they did not have prior. + Packages could be removed because of consuming too much storage, not being used by the people who share the + server, or they are no longer secure. It is often good practice to 'do some spring cleaning' every now and + then and remove the packages that no longer serve you any purpose. + Does not show this last mark statement after the list
    - {% endif %} - {% if list_package_upgrade|length < 0 %} - Out of the installed packages, none were upgraded today... - - {% endif %} + {% endif %} + {% if list_package_remove|length < 0 %} + No packages were removed today... + + {% endif %} + + + These actions are only a portion of the work... There's also the relationships of the people who care for + the server enough to maintain it... The hours they put into meeting each other, discussing and deciding on + how to move forward... They are sharing a digital landscape in which there are no hierarchies of landlords + and renters... So, they find different ways to make a space for learning and co-habitation... This list is + not exhaustive. + +

    tldr@chopchop:~ $sudo journalctl _COMM=systemd-login --output-fields=MESSAGE -S today -g "New + session" | grep -v 'Boot'

    + + Users can login to the server using the SSH (secure shell) protocol. This allows a user to explore files, + make changes, run commands and speak to the server from their own machine. This is useful when working + remotely, and also to allow multiple users logging into the server simultaneously. Current XPUB1 students + have a chopchop user, as well as the tutors. Additionally, there are some users not associated with a + person, like our shared user 'chipchip' and users for running specific processes or creating projects. + + + {% if logins_today is defined %} +
      + {% for item in logins_today %} +
    • {{ item }}
      • + {% endfor %} +
    + does not show the users of logins_today + + These users have logged into our shared server chopchop, during the course of this day. + + {% endif %} - {% if list_package_remove|length > 0 %} -

    tldr@chopchop:~ $ grep 'remove' /var/log/dpkg.log

    + {% if groups_created|length > 0 %} +

    tldr@chopchop:~ $sudo journalctl _COMM=groupadd -r --output-fields=MESSAGE

    + + This command shows whether groups were added today. + +
      + {% for item in groups_created %} +
    • {{ item }}
      • - These package were removed today: + These new working groups were added today. They might be used for creating new projects, maintaining or + managing parts of the server, or for organizational purposes. -
        - {% for item in list_package_remove %} -
      • {{ item }}
        • - {% endfor %} - - Packages could be removed because of consuming too much storage, not being used by the people who share the - server, or they are no longer secure. It is often good practice to 'do some spring cleaning' every now and - then and remove the packages that no longer serve you any purpose. - - Does not show this last mark statement after the list -
      - {% endif %} - {% if list_package_remove|length < 0 %} - No packages were removed today... - - {% endif %} - - These actions are only a portion of the work... There's also the relationships of the people who care for - the server enough to maintain it... The hours they put into meeting each other, discussing and deciding on - how to move forward... They are sharing a digital landscape in which there are no hierarchies of landlords - and renters... So, they find different ways to make a space for learning and co-habitation... This list is - not exhaustive. - -

      tldr@chopchop:~ $sudo journalctl _COMM=systemd-login - --output-fields=MESSAGE -S today -g "New session" | grep -v 'Boot'

      - - Users can login to the server using the SSH (secure shell) protocol. This allows a user to explore files, - make changes, run commands and speak to the server from their own machine. This is useful when working - remotely, and also to allow multiple users logging into the server simultaneously. Current XPUB1 students - have a chopchop user, as well as the tutors. Additionally, there are some users not associated with a - person, like our shared user 'chipchip' and users for running specific processes or creating projects. - - {% if logins_today is defined %} -
        - {% for item in logins_today %} -
      • {{ item }}
        • - {% endfor %} -
      - does not show the users of logins_today - - These users have logged into our shared server chopchop, during the course of this day. - - {% endif %} + check dis + {% endfor %} +
    + {% endif %} + + {% if groups_created|length < 0 %} + No groups were added today. + {% endif %} + For some reason this if statement is not working, i didn't apply it to the next 4 categories because i + wanted to check it works first - {% if groups_created|length > 0 %} -

    tldr@chopchop:~ $sudo journalctl _COMM=groupadd -r --output-fields=MESSAGE

    - - This command shows whether groups were added today. - -
      - {% for item in groups_created %} -
    • {{ item }}
      • - - These new working groups were added today. They might be used for creating new projects, maintaining or - managing parts of the server, or for organizational purposes. - - {% endfor %} -
    - {% endif %} - {% if groups_created|length < 0 %} - No groups were added today. - - {% endif %} - For some reason this if statement is not working, i didn't apply it to the next 4 categories because i - wanted to check it works first +

    tldr@chopchop:~ $sudo journalctl _COMM=grouPremove -r --output-fields=MES

    + + This command shows whether groups were removed today. + -

    tldr@chopchop:~ $sudo journalctl _COMM=grouPremove -r --output-fields=MES

    - - This command shows whether groups were removed today. - -
      - {% for item in groups_removed %} -
    • {{ item }}
      • - - These new groups were removed today. Most likely they were no longer relevant or purposeful. - - {% endfor %} -
    +
      + {% for item in groups_removed %} +
    • {{ item }}
      • + + These new groups were removed today. Most likely they were no longer relevant or purposeful. + + check dis + {% endfor %} +
    -

    tldr@chopchop:~ $sudo journalctl _COMM=usermod -r

    - - This command shows whether users were modified today. - -
      - {% for item in user_modified %} -
    • {{ item }}
      • - - These users have been modified. Probably because someone changed their password, keys, or other - settings, or given new permissions. - - {% endfor %} -
    +

    tldr@chopchop:~ $sudo journalctl _COMM=usermod -r

    + + This command shows whether users were modified today. + +
      + {% for item in user_modified %} +
    • {{ item }}
      • + + These users have been modified. Probably because someone changed their password, keys, or other + settings, or given new permissions. + + check dis + {% endfor %} +
    -

    tldr@chopchop:~ $sudo journalctl _COMM=userdel -r

    - - This command shows whether users were removed today. - -
      - {% for item in user_deleted %} -
    • {{ item }}
      • - - It seems that a user was removed. This doesn't happen too often... It could be that they have done - something to lose the trust of the community. The circle of trust shrunk ever so slightly. - - {% endfor %} -
    +

    tldr@chopchop:~ $sudo journalctl _COMM=userdel -r

    + + This command shows whether users were removed today. + +
      + {% for item in user_deleted %} +
    • {{ item }}
      • + + It seems that a user was removed. This doesn't happen too often... It could be that they have done + something to lose the trust of the community. The circle of trust shrunk ever so slightly. + + check dis + {% endfor %} +
    -

    tldr@chopchop:~ $sudo service --status-all

    - - These are all of the services that are active, running, working to execute requests that enable everything - on the server. They are marked with an [+]. - The rest, marked with a [-], are idle, not running, or waiting to be activating upon sending a request. - -
      - {% for item in list_active_services %} -
    • {{ item }}
      • - {% endfor %} -
    +

    tldr@chopchop:~ $sudo service --status-all

    + + These are all of the services that are active, running, working to execute requests that enable everything + on the server. They are marked with an [+]. + The rest, marked with a [-], are idle, not running, or waiting to be activating upon sending a request. + +
      + {% for item in list_active_services %} +
    • {{ item }}
      • + {% endfor %} +
    -

    tldr@chopchop:~ $sudo journalctl -S today -u kitchen-stove.service -u - kitchen-bin.service -u kitchen-fridge.service -r -n

    - {% if kitchen_services|length > 0 %} -
      - {% for item in kitchen_services %} -
    • {{ item }}
      • - {% endfor %} -
    - {% endif %} +

    tldr@chopchop:~ $sudo journalctl -S today -u kitchen-stove.service -u + kitchen-bin.service -u kitchen-fridge.service -r -n

    + {% if kitchen_services|length > 0 %} +
      + {% for item in kitchen_services %} +
    • {{ item }}
      • + {% endfor %} +
    + {% endif %} - + \ No newline at end of file