diff --git a/pillars/roles/nginx/nextcloud.sls b/pillars/roles/nginx/nextcloud.sls index 0130a1a..8f85be4 100644 --- a/pillars/roles/nginx/nextcloud.sls +++ b/pillars/roles/nginx/nextcloud.sls @@ -1,3 +1,11 @@ + +nginx: + cloud: + auth: none + https: + port: 8080 + prot: http + nolocal: true portal: Misc: cloud: diff --git a/states/roles/maintain/certbot/certbot.sh b/states/roles/maintain/certbot/certbot.sh index 3de2f3b..90bf552 100644 --- a/states/roles/maintain/certbot/certbot.sh +++ b/states/roles/maintain/certbot/certbot.sh @@ -1,3 +1,6 @@ echo "Running certbot renew" > /root/scripts/certbot.log /bin/certbot renew >> /root/scripts/certbot.log echo "Finished certbot renew" >> /root/scripts/certbot.log +echo "Copying certs to /secure" >> /root/scripts/certbot.log +cp -rL /etc/letsencrypt/live/* /secure/certs/ +echo "Done copying certs to /secure" >> /root/scripts/certbot.log diff --git a/temp.log b/temp.log new file mode 100644 index 0000000..04fe571 --- /dev/null +++ b/temp.log @@ -0,0 +1,113 @@ +local: + Name: /etc/pacman.d/aur-local - Function: file.managed - Result: Clean Started: - 09:25:40.320283 Duration: 79.212 ms + Name: /etc/pacman.conf - Function: file.append - Result: Clean Started: - 09:25:40.399758 Duration: 6.714 ms + Name: /etc/pacman.conf - Function: file.replace - Result: Clean Started: - 09:25:40.406714 Duration: 7.949 ms + Name: /etc/pacman.d/mirrorlist - Function: file.managed - Result: Clean Started: - 09:25:40.414925 Duration: 28.16 ms + Name: update - Function: pkg.uptodate - Result: Clean Started: - 09:25:42.695128 Duration: 1646.374 ms + Name: yes|pacman -Scc - Function: cmd.run - Result: Changed Started: - 09:25:44.343301 Duration: 18.166 ms + Name: basepkgs - Function: pkg.installed - Result: Clean Started: - 09:25:44.388942 Duration: 83.348 ms + Name: roles - Function: grains.present - Result: Clean Started: - 09:25:44.473886 Duration: 1.944 ms + Name: /etc/saltbashrc - Function: file.managed - Result: Clean Started: - 09:25:44.476126 Duration: 16.158 ms + Name: /etc/skel/.bashrc - Function: file.symlink - Result: Clean Started: - 09:25:44.492624 Duration: 12.826 ms + Name: /root/.bashrc - Function: file.symlink - Result: Clean Started: - 09:25:44.505710 Duration: 12.118 ms + Name: /root/.profile - Function: file.symlink - Result: Clean Started: - 09:25:44.518087 Duration: 12.255 ms + Name: iptables - Function: pkg.installed - Result: Clean Started: - 09:25:44.530601 Duration: 83.286 ms + Name: firewalld - Function: pkg.installed - Result: Clean Started: - 09:25:44.614181 Duration: 82.211 ms + Name: /etc/firewalld/zones/60_guest.xml - Function: file.managed - Result: Clean Started: - 09:25:44.699355 Duration: 83.449 ms + Name: /etc/firewalld/zones/70_internal.xml - Function: file.managed - Result: Clean Started: - 09:25:44.783033 Duration: 81.281 ms + Name: /etc/firewalld/zones/99_public.xml - Function: file.managed - Result: Clean Started: - 09:25:44.864552 Duration: 82.565 ms + Name: /etc/firewalld/zones/10_enduser.xml - Function: file.managed - Result: Clean Started: - 09:25:44.947349 Duration: 83.795 ms + Name: /etc/firewalld/zones/50_server.xml - Function: file.managed - Result: Clean Started: - 09:25:45.031380 Duration: 81.925 ms + Name: firewalld - Function: service.dead - Result: Clean Started: - 09:25:45.113999 Duration: 59.305 ms + Name: salt-minion - Function: service.running - Result: Clean Started: - 09:25:45.174086 Duration: 41.627 ms + Name: monitoring_pkgs - Function: pkg.installed - Result: Clean Started: - 09:25:45.216152 Duration: 83.961 ms + Name: /etc/nrpe/nrpe.cfg - Function: file.managed - Result: Clean Started: - 09:25:45.300451 Duration: 22.294 ms + Name: /etc/nrpe/commands.d - Function: file.recurse - Result: Clean Started: - 09:25:45.323019 Duration: 49.392 ms + Name: /opt/scripts/nrpe - Function: file.recurse - Result: Clean Started: - 09:25:45.373524 Duration: 91.149 ms + Name: nrpe - Function: service.running - Result: Clean Started: - 09:25:45.466287 Duration: 38.834 ms + Name: autofs - Function: pkg.installed - Result: Clean Started: - 09:25:45.505429 Duration: 85.505 ms + Name: /etc/autofs/auto.master - Function: file.managed - Result: Clean Started: - 09:25:45.593165 Duration: 15.215 ms + Name: /etc/autofs/auto.ssh - Function: file.managed - Result: Clean Started: - 09:25:45.608611 Duration: 24.096 ms + Name: autofs - Function: service.running - Result: Clean Started: - 09:25:45.633639 Duration: 37.728 ms + Name: fuse2 - Function: pkg.installed - Result: Clean Started: - 09:25:45.671660 Duration: 84.124 ms + Name: sshfs - Function: pkg.installed - Result: Clean Started: - 09:25:45.756121 Duration: 82.507 ms + Name: fuse - Function: kmod.present - Result: Clean Started: - 09:25:45.840011 Duration: 9.064 ms + Name: host.actcur.com - Function: ssh_known_hosts.present - Result: Clean Started: - 09:25:45.850268 Duration: 17.77 ms + Name: /root/.ssh/backups_key - Function: file.managed - Result: Clean Started: - 09:25:45.868329 Duration: 17.111 ms + Name: /mnt/backups - Function: file.symlink - Result: Clean Started: - 09:25:45.885723 Duration: 12.94 ms + Name: /root/.ssh/ca_key - Function: file.managed - Result: Clean Started: - 09:25:45.898923 Duration: 16.691 ms + Name: /secure/ca - Function: file.symlink - Result: Clean Started: - 09:25:45.915967 Duration: 12.99 ms + Name: git - Function: pkg.installed - Result: Clean Started: - 09:25:45.929441 Duration: 82.474 ms + Name: /root/.ssh/git_actcur - Function: file.managed - Result: Clean Started: - 09:25:46.012212 Duration: 15.89 ms +---------- + ID: salt + Function: git.latest + Name: ssh://gogs@git.actcur.com:5022/actcur/salt.git + Result: False + Comment: Failed to check remote refs: Unable to authenticate using identity file: + + gogs@git.actcur.com: Permission denied (publickey). + fatal: Could not read from remote repository. + + Please make sure you have the correct access rights + and the repository exists. + Started: 09:25:46.034781 + Duration: 117.095 ms + Changes: + Name: user.name - Function: git.config_set - Result: Clean Started: - 09:25:46.152193 Duration: 5.638 ms + Name: user.email - Function: git.config_set - Result: Clean Started: - 09:25:46.158078 Duration: 4.614 ms + Name: core.sshCommand - Function: git.config_set - Result: Clean Started: - 09:25:46.162943 Duration: 4.592 ms + Name: /root/.ssh/git_actcur - Function: file.managed - Result: Clean Started: - 09:25:46.167779 Duration: 15.562 ms +---------- + ID: salt_dev + Function: git.latest + Name: ssh://gogs@git.actcur.com:5022/actcur/salt.git + Result: False + Comment: Failed to check remote refs: Unable to authenticate using identity file: + + gogs@git.actcur.com: Permission denied (publickey). + fatal: Could not read from remote repository. + + Please make sure you have the correct access rights + and the repository exists. + Started: 09:25:46.183608 + Duration: 128.79 ms + Changes: + Name: user.name - Function: git.config_set - Result: Clean Started: - 09:25:46.312778 Duration: 5.474 ms + Name: user.email - Function: git.config_set - Result: Clean Started: - 09:25:46.318523 Duration: 4.527 ms + Name: core.sshCommand - Function: git.config_set - Result: Clean Started: - 09:25:46.323292 Duration: 4.675 ms + Name: sshd - Function: service.running - Result: Clean Started: - 09:25:46.328211 Duration: 43.011 ms + Name: salt-minion - Function: pkg.installed - Result: Clean Started: - 09:25:46.371573 Duration: 84.326 ms + Name: /etc/salt/minion - Function: file.managed - Result: Clean Started: - 09:25:46.457216 Duration: 36.8 ms + Name: salt-minion - Function: service.running - Result: Clean Started: - 09:25:46.494900 Duration: 29.239 ms + Name: /root/scripts/highstate.sh - Function: file.managed - Result: Clean Started: - 09:25:46.524497 Duration: 17.536 ms + Name: /lib/systemd/system/highstate.service - Function: file.managed - Result: Clean Started: - 09:25:46.542335 Duration: 16.37 ms + Name: /lib/systemd/system/highstate.timer - Function: file.managed - Result: Clean Started: - 09:25:46.558971 Duration: 16.62 ms + Name: highstate.timer - Function: service.running - Result: Clean Started: - 09:25:46.575903 Duration: 40.484 ms + Name: service.systemctl_reload - Function: module.run - Result: Clean Started: - 09:25:46.619503 Duration: 0.008 ms + Name: salt-master - Function: pkg.installed - Result: Clean Started: - 09:25:46.619646 Duration: 82.853 ms + Name: /etc/salt/master - Function: file.managed - Result: Clean Started: - 09:25:46.703841 Duration: 17.44 ms + Name: salt-master - Function: service.running - Result: Clean Started: - 09:25:46.721996 Duration: 43.603 ms + Name: /srv/salt/prod/states/pillars - Function: file.symlink - Result: Clean Started: - 09:25:46.765965 Duration: 13.426 ms + Name: pacman-contrib - Function: pkg.installed - Result: Clean Started: - 09:25:46.779664 Duration: 83.403 ms + Name: /root/scripts/getmirrors.sh - Function: file.managed - Result: Clean Started: - 09:25:46.863417 Duration: 20.503 ms + Name: /usr/lib/systemd/system/getmirrors.service - Function: file.managed - Result: Clean Started: - 09:25:46.884426 Duration: 21.295 ms + Name: /usr/lib/systemd/system/getmirrors.timer - Function: file.managed - Result: Clean Started: - 09:25:46.906443 Duration: 18.701 ms + Name: getmirrors.timer - Function: service.running - Result: Clean Started: - 09:25:46.925449 Duration: 44.413 ms + Name: /srv/salt/prod/states/mirrors.list - Function: file.symlink - Result: Clean Started: - 09:25:46.970183 Duration: 13.721 ms + Name: /srv/salt/prod/states/mirrors.jinja - Function: file.symlink - Result: Clean Started: - 09:25:46.984184 Duration: 12.807 ms + Name: /usr/lib/systemd/system/certbot.service - Function: file.managed - Result: Clean Started: - 09:25:46.998555 Duration: 16.725 ms + Name: /usr/lib/systemd/system/certbot.timer - Function: file.managed - Result: Clean Started: - 09:25:47.015505 Duration: 15.664 ms + Name: service.systemctl_reload - Function: module.run - Result: Clean Started: - 09:25:47.031861 Duration: 0.005 ms + Name: certbot - Function: pkg.installed - Result: Clean Started: - 09:25:47.032016 Duration: 83.691 ms + Name: /root/scripts/certbot.sh - Function: file.managed - Result: Clean Started: - 09:25:47.116071 Duration: 16.535 ms + Name: certbot.timer - Function: service.running - Result: Clean Started: - 09:25:47.132885 Duration: 38.389 ms + Name: service.systemctl_reload - Function: module.run - Result: Clean Started: - 09:25:47.172064 Duration: 0.006 ms + +Summary for local +------------- +Succeeded: 74 (changed=1) +Failed: 2 +------------- +Total states run: 76 +Total run time: 4.523 s